Compare commits

...

1565 Commits

Author SHA1 Message Date
jessi-apple 8b2cf8889a Merge pull request #1592 from simon-apple/dev/swiftUI-beta-update
Public beta 2 - SwiftUI
2025-01-24 09:46:17 -08:00
Simon Tsai 3f83f6ab4f RK SwiftUI Beta 2 Release (#2534) 2025-01-22 11:18:03 -08:00
Corey 7abce4c982 fix: Use accent color instead of hardcoded blue (#1590) 2024-12-19 15:04:39 -08:00
simon-apple eedd39d0a8 Public beta release - SwiftUI 2024-10-21 14:54:38 -07:00
Pariece McKinney 5c5d295bd5 Public release 3.1.0 2024-10-15 17:05:47 -04:00
Pariece McKinney b274d1f84e Update README.md 2024-10-15 08:23:23 -04:00
aplummer-apple 57427e8c7e Set “Enable Module Verifier” flag to “Yes” only in Release build configuration (#1579) 2024-08-08 18:21:18 -04:00
Louie 6cfb995d83 cleaning up unused strings (#1578) 2024-06-26 10:23:19 -07:00
Pariece McKinney c71d1a56dd Public release 3.0.1 2024-05-08 14:56:11 -04:00
Corey 6c24a7e922 ci: Add code integration testing to repo (#1569) 2024-04-10 14:33:32 -04:00
Pariece McKinney b14e5cfcb0 Public Release 3.0 2024-03-28 19:39:04 -04:00
Louie fee76c2d93 Merge branch 'stable' into main 2023-12-05 14:00:17 -08:00
Louie a07041901b Public Release 2.2.15
Various ORKTextChoiceOther and ORKChoiceOtherViewCell improvements
Bumped version to 2.2.15
Bumped Cocoapod version to 2.2.15
2023-12-05 11:19:31 -08:00
Louie Chatta c370011616 Public Release 2.2.15
- Various ORKTextChoiceOther and ORKChoiceOtherViewCell improvements 
- Bumped version to 2.2.15
- Bumped Cocoapod version to 2.2.15
2023-12-05 11:02:55 -08:00
Pariece McKinney b8f155974c Public release/2.2.12 (#1555)
- Fixed `ORKHealthKitQuantityTypeAnswerFormat`issues
- Improved `ORKReviewStep` initialization
- Introduced a new property called `shouldAutomaticallyAdjustImageTintColor` on `ORKStep` to automatically adopt dark mode version of an image
- Added `ORKSESQuestionResult` to Table View Providers
- ORKCatalog Improvements
- ORKImageSelectionView improvements
- Bumped version to 2.2.12
2023-11-01 18:18:20 -04:00
Pariece McKinney 2fb22a6256 Public release/2.2.10 (#1548)
Fix ORKNavigationContainerView so that it does not call didMoveToWindow from tintColorDidChange
Bumped version to 2.2.10
2023-05-10 17:40:25 -04:00
ronzilla-apple bd60d945bb Public release/2.2.9 (#1541)
* Address issue where there was no option to "Save Results" if task is cancelled (Issue #1536/1540)
* Address an issue where ORKTaskViewController setting tintColor on stepViewController views broke ORKStepViewController's addResult:

* Fixed order issue of tone audiometry steps
* Include missing ORKSpeechRecognition header export (Issue #1534)
* Switch to contentEdgeInsets API in ORKContinueButton to fix an issue where button title wouldn't always fit onscreen (on iOS 16 during long press) (Issue #1533)
* Remove min/max values for ORKCatalog "Numeric with Display Unit"

* xcconfig file updates for version and driving ORKCatalog bundleID
* Addressing compiler warnings
* Added unit tests for init'ing taskViewController with restoration data
* Adding task restoration feature to ORKCatalog's taskViewController presentation
2023-02-13 11:03:48 -08:00
Pariece McKinney 8f58410af9 Release 2.2.8
-Bug fixes and enhancements
-New helper method (ORKViewTintColor) for setting tintColor
-New “displayUnit” property added to ORKAnswerFormat
-Updates in ORKNormalizedReactionTimeResult’s secure coding (breaks compatibility with previous archives).
2022-12-20 11:14:59 -08:00
Louie fc67cc944c Merge pull request #1519 from cbaker6/fixTintColor
Propagate tintColor if window not available
2022-11-29 20:22:37 -08:00
Louie c8473017ec Merge pull request #1531 from ResearchKit/cocoapod_fix
remove deprecated ORKConsent files
2022-11-29 13:21:51 -08:00
Louie 1b9daf60ee Merge pull request #1530 from ResearchKit/cocoapod_version_bump
Point ResearchKit.podspec to 2.1.0
2022-11-29 13:11:01 -08:00
Louis Chatta 2bc0033aa8 remove deprecated ORKConsent files 2022-11-29 11:51:42 -08:00
Louis Chatta e71d71cf9c Point ResearchKit.podspec to 2.1.0 2022-11-29 11:48:27 -08:00
Corey Baker 64a068596b make suggested changes 2022-11-28 15:25:59 -05:00
Corey Baker c10693930d Fix tintColor for ORKWebViewStepViewController buttons 2022-11-15 20:48:25 -05:00
Corey Baker c0f309edf3 only check for tintColor once in viewControllerForStep 2022-11-15 09:16:44 -05:00
Corey Baker b1cc631748 propagate tintColor if window not available 2022-11-14 14:46:02 -05:00
Pariece McKinney a89059f5dc 2.1.1 Release
-Bug fixes
-New ORKAccuracyStroopStep
-AudioStep now allows for audio recording 
-New Styles for ORKDontKnowButton
-General layout and UI improvements
2022-10-26 16:07:45 -07:00
Will 2cc8f9e7d5 Prevent isPasscodeStoredInKeychain crash, correct warnings (#1505)
* fix: prevent isPasscodeStoredInKeychain from causing a crash

* fix: prevent nskeyedunarchiver warnings, add missing classes
2022-06-16 10:55:09 -07:00
akshay-yadav 29950b62e4 marker 2022-06-15 12:53:26 -07:00
akshay-yadav 65de4b333c README update 2022-06-15 11:44:35 -07:00
akshay-yadav 63fcf4918f Merge branch 'stable' into 'main' for housekeeping 2022-06-15 11:40:04 -07:00
akshay-yadav c9880b0139 merge stable into main
resolve merge conflicts
Bugfixes
Cleanup
merge main back to stable
2022-06-15 11:38:42 -07:00
akshay-yadav 13eabb7720 merging stable back to main
Resolving Merge conflicts
Bugfixes
Cleanup
2022-06-15 11:37:16 -07:00
Pariece McKinney 743b773ea3 Point RK to IOS 13 (#1499) 2022-04-25 09:40:44 -07:00
Pariece McKinney 249eee5dfb IOS15 Fixes (#1487) 2022-02-17 11:29:47 -08:00
aplummer-apple 90c68d0d19 Update project library search paths to compile on apple silicon (#1479)
I believe this line was in here to resolve issues with an early beta of xcode 11 and is unnecessary now
2021-11-29 10:20:27 -08:00
Pariece McKinney d10a427911 Merge pull request #1471 from Pariecemckinney-apple/pmckinney/taskVCDeprecationWarningFix
Fix ORKTaskViewController deprecation warning
2021-10-25 14:50:24 -07:00
Pariecemckinney-apple 05755a3213 initial commit 2021-10-25 11:38:50 -07:00
Corey e18a633de1 Set ORKTaskViewController nav background color (#1469) 2021-10-04 13:58:03 -07:00
Pariece McKinney 0e68cdf744 Merge pull request #1448 from stevemoser/patch-6
Fix broken Apple Forums link
2021-06-28 15:58:31 -07:00
Pariece McKinney 7f119a8d0d Merge pull request #1338 from Hengyu/hengyu
Use implied answer format for cells
2021-06-28 15:54:27 -07:00
hengyu fde1e7e957 Use implied answer format for cells 2021-06-27 14:58:31 +08:00
Erik Hornberger 0ad96d505c Merge pull request #1462 from erik-apple/nullable-return-type
Silence warning about nullable return types
2021-06-21 15:25:36 -07:00
Erik Hornberger d4ff76fc25 Silence warning about nullable return types 2021-06-21 15:08:01 -07:00
Erik Hornberger 85c1395361 Merge pull request #1461 from erik-apple/update-deprecated-method-in-keychain
Update deprecated method call
2021-06-21 14:47:45 -07:00
Erik Hornberger 1443e57c57 Replace deprecated method call 2021-06-21 14:22:10 -07:00
Erik Hornberger 3b75f6213c Updates to the predefined range of motion task (#1459) 2021-05-25 17:05:56 -07:00
gavirawson-apple e9d5de64a5 Clip step image (#1457) 2021-05-19 18:11:15 -07:00
Erik Hornberger 19c61383f6 Permission Type Updates (#1454)
* Ensure that the slider's colors match the view's tint

* New visual style for request permission step

* Add a new notifications permission type

* Add a new motion activity permission type

* Update ORKRequestPermissionButton.m

* Forward declare button

* Update ResearchKit/Common/ORKPermissionType.m

Co-authored-by: joeylabarck-apple <81833193+joeylabarck-apple@users.noreply.github.com>

* Update ResearchKit/Common/ORKPermissionType.h

Co-authored-by: joeylabarck-apple <81833193+joeylabarck-apple@users.noreply.github.com>

* Update ResearchKit/Common/ORKMotionActivityPermissionType.h

Co-authored-by: joeylabarck-apple <81833193+joeylabarck-apple@users.noreply.github.com>

* Update ResearchKit/Common/ORKPermissionType.h

Co-authored-by: joeylabarck-apple <81833193+joeylabarck-apple@users.noreply.github.com>

* Update ResearchKit/Common/ORKPermissionType.h

Co-authored-by: joeylabarck-apple <81833193+joeylabarck-apple@users.noreply.github.com>

* Add missing import

* Add missing import

Co-authored-by: joeylabarck-apple <81833193+joeylabarck-apple@users.noreply.github.com>
2021-04-16 17:02:45 -07:00
Steve Moser cb6cc97fa4 Fix broken Apple Forums link 2021-03-01 08:26:36 -05:00
srinathtm-apple 0651bf0c2a Use wheel date picker style (#1447)
* Use wheel date picker style
2021-02-11 19:16:32 -08:00
Pariece McKinney 68f9d29b66 Merge pull request #1396 from Pariecemckinney-apple/video_instruction_fix_issue_1389
Video Instruction Step Now Presents Play Button (#1389)
2020-08-03 16:29:25 -07:00
Pariecemckinney-apple 24afb1b1ec video instruction step now presents the play button so that the user can present the video intended for them 2020-08-03 16:19:07 -07:00
Kyle Seth Gray 47f44c488e Update ORKSkin.m (#1390)
literally just a misspelling of 'Margin'
2020-07-21 11:13:42 -07:00
Pariece McKinney a9b64253f1 VideoCaptureStep now corrects its state when navigating to it after pressing the back button (#1386)
Co-authored-by: Pariece McKinney <pariecemckinney@gmail.com>
2020-07-17 15:44:23 -07:00
Volodymyr Klymenko 506dc646ad Fix markdown formatting (#1383) 2020-06-24 14:21:05 -07:00
srinathtm-apple b50b759c7e RK 2.1 updates (#1384) 2020-06-24 14:20:11 -07:00
Greg Fiumara ed2602e523 Handle new UITouchPhase enumerations. (#1366)
* Handle new UITouchPhase enumerations.

Added in iOS 13.4.

* Conditionally include new UITouchPhase enums.
2020-04-05 16:36:15 -07:00
srinathtm-apple bbe376cddc Remove scripts folder, this is causing app store submission issues (#1362)
* removing scripts folder

* removing references from build phases
2020-03-26 11:25:16 -07:00
srinathtm-apple 50a2b3427a RK 2.1 updates (#1343)
* updates to RK 2.1

* adding AirPodsPro calibration data
2020-03-09 20:34:15 -07:00
Alex Wald ac7c63fc1b added missing nullability annotation in one of the initialisers (#1323) 2020-02-10 12:41:39 -08:00
srinathtm-apple b50e1d7aa4 Merge pull request #1333 from davwillev/master
Spoken instruction for TouchAnywhereStep changed from from title to text
2020-02-10 12:38:47 -08:00
David Evans 454e501cb6 Reallocated TouchAnywhereStep spoken instructions
Reallocated TouchAnywhereStep spoken instructions from task 'title' to instruction 'text'
2020-01-17 12:44:51 +00:00
David Evans 69cb1b7f2e Merge pull request #7 from ResearchKit/master
Update from master
2020-01-06 14:04:09 +00:00
srinathtm-apple 7c8917deb0 Merge pull request #1329 from xinsight/remove-tests-from-archive-2
remove tests from archive
2019-12-11 10:55:26 -08:00
Jay Moore e5e96b8db9 remove address and undef behaviour sanitizers 2019-12-11 18:04:31 +01:00
Jay Moore faffea0008 remove tests from archive 2019-12-11 13:28:29 +01:00
erik-apple e08711ff4b Retrieve tint color from view's window instead of AppDelegate's window (#1324)
We used to retrieve the view's tint color from a reference to the window held by the AppDelegate, however, iOS 13 introduced a new SceneDelegate pattern in which there may be more than one window. We now have to retrieve the tint color from window that the view belongs to, as there may be multiple windows with different tint colors.
2019-12-03 23:23:57 -05:00
srinathtm-apple c6c99a41db Merge pull request #1321 from erik-apple/2.1
ResearchKit 2.1 Update
2019-11-22 17:11:35 -08:00
erik-apple ff709e01f2 Update .travis.yml for Xcode 11 and iOS 13 2019-11-22 16:58:20 -08:00
erik-apple 666bf54dd5 Update ORKFormStep.h 2019-11-22 16:52:30 -08:00
erik-apple fbcd6adc9e Merge branch 'master' into 2.1 2019-11-22 16:48:50 -08:00
Erik Hornberger 2dc3cfb109 ResearchKit 2.1 Update 2019-11-22 16:40:08 -08:00
akshay-yadav ae9b9e57cb updates 2019-10-24 14:19:09 -07:00
srinathtm-apple e19dfbff8d Merge pull request #1298 from susom/instructionStepView-learnMore-fix
Fix displaying of Close button in ORKLearnMoreStepViewController
2019-10-23 12:03:58 -07:00
srinathtm-apple 6fc2e6d0fe Merge pull request #1308 from chrisortman/master
Fixes podspec in cocoapods 1.8.0
2019-10-23 12:03:24 -07:00
srinathtm-apple 456c3e4a45 Merge pull request #1311 from CareEvolution/sectionBug
Bugfix - Index needs to be _allSections
2019-10-23 12:02:54 -07:00
Eric Schramm eaca80f55a index needs to be _allSections 2019-10-17 08:45:10 -05:00
Chris Ortman d60ab56972 Fixes podspec in cocoapods 1.8.0 2019-10-04 16:56:39 -05:00
Paweł Kowalczyk 6b55e5ba81 Fix displaying of Close button in ORKLearnMoreStepViewController 2019-09-02 17:52:12 +02:00
David Evans 8c16ee46cc Merge pull request #6 from ResearchKit/master
Updating master to latest version
2019-07-24 12:15:53 +01:00
srinathtm-apple d56e6d5267 Merge pull request #1288 from srinathtm-apple/master
adding macro to bypass ios13 only api
2019-06-20 10:37:16 -07:00
Srinath Tupil Muralidharan 1ff84f4f96 adding macro to bypass ios13 only api 2019-06-19 16:08:14 -07:00
srinathtm-apple 3efb3ae1ae Merge pull request #1279 from CareEvolution/hideORKFormItemFix
Fix for hidePredicate changes where an ORKTableSection may contain more than one ORKFormItem
2019-06-17 14:39:02 -07:00
Eric Schramm d516d0cc0a reimplementation of hide ORKFormItem post-RK 2.1 2019-06-16 18:10:06 -05:00
Eric Schramm d2794890f8 Merge branch 'appleMaster' into hideORKFormItemFix
# Conflicts:
#	ResearchKit/Common/ORKFormStepViewController.m
2019-06-16 17:55:51 -05:00
srinathtm-apple ae70457c56 Merge pull request #1282 from ninoguba/bugfix_flash_modes
Fixed crash related to supported flash modes on certain devices
2019-06-04 13:57:27 -07:00
srinathtm-apple 800e45a27a Merge pull request #1280 from gabriel-blanco-apple/embeddedReviewStepIsEmpty-51368434
Missing embedded summary in ORKReviewStep
2019-06-04 13:56:51 -07:00
Akshay Yadav 7b6dae062c ResearchKit 2.1 Beta 2019-06-04 13:45:18 -07:00
Nino Guba 5070325d9a Fixed crash related to supported flash modes on certain devices 2019-06-03 18:48:21 -07:00
Gabriel Blanco 84511204d2 Missing embedded summary in ORKReviewStep
Bug introduced here:

commit 9ef1876c45
Author: Brian Ganninger <coder@infinitenexus.com>
Date:   Sun Nov 25 20:44:22 2018 -0800

    [code cleanup] Review mismatched nil returns (issue #1214)

——

Impact:
Causes embedded ORKReviewStep to return no steps
2019-06-03 14:52:32 -07:00
Eric Schramm ad8129efdf fixes for animation of changes 2019-06-02 22:48:57 -05:00
Eric Schramm 5f0f32f824 hideForm fix for sections which contain >1 forms 2019-05-31 15:17:59 -05:00
srinathtm-apple 7347a99520 Merge pull request #1277 from PersonalTouchProjects/mytouch
Add new activity tasks
2019-05-30 16:59:43 -07:00
Tommy Lin 12b2df63b4 Add missing header files to umbrella headers 2019-05-28 01:54:28 +08:00
Tommy Lin 00ac394379 Inherit ORKTouchAbilityScrollResult from ORKResult instead of ORKStepResult (typo) 2019-05-28 01:51:46 +08:00
srinathtm-apple 8f8cc4de14 Merge pull request #1271 from CareEvolution/Schramm/hideFormItemWithPredicate-2.0
Conditionally Hide an ORKFormItem based on an NSPredicate
2019-05-27 09:17:06 -07:00
Tommy Lin 577f612778 Fix retain cycle warnings 2019-05-27 22:31:10 +08:00
Tommy Lin e0f092decc Fix shadow declaration warning 2019-05-27 22:10:59 +08:00
Tommy Lin acacacdcce Add NSCopying, NSCoding and isEqual to ORKTouchAbility steps 2019-05-27 20:56:28 +08:00
Eric Schramm fce7172bac rename - filtered to hidden 2019-05-08 12:31:39 -05:00
Eric Schramm 264d51f1c9 explicitly compare against nil 2019-05-08 12:13:42 -05:00
Eric Schramm 6b1dd7f73d naming improvements, simplification 2019-05-08 12:08:50 -05:00
Eric Schramm ad5b4cb2fd update for renaming to hidePredicate 2019-04-24 21:44:08 -05:00
Eric Schramm 1faa99a490 rename to hidePredicate 2019-04-24 21:43:46 -05:00
Eric Schramm cf67d09e1b remove null results for filtered formItems 2019-04-24 16:00:29 -05:00
Eric Schramm 14a87b2067 fixed to corrected indexPath due to filtering 2019-04-24 15:56:53 -05:00
Eric Schramm 4f59976114 bypass non-optional formItems that are filtered 2019-04-24 15:36:34 -05:00
Eric Schramm 392dd87881 stop animated scrolling if no section show/hide changes 2019-04-19 16:06:03 -05:00
Eric Schramm fd8c973004 update didSelect to unfiltered indexPath 2019-04-19 15:16:01 -05:00
Eric Schramm ab400a203a implement hideItemPredicate in ORKFormStepVC 2019-04-19 14:43:39 -05:00
Eric Schramm 7fbd650fbb add hideItemPredicate to ORKFormItem 2019-04-19 14:39:42 -05:00
srinathtm-apple 01cc7ed79d Project updates (#1264)
* overall updates to ResearchKit, new textChoiceOtherAnswerFormat, unit tests and more..
2019-04-15 14:42:02 -07:00
Tommy Lin 62d5f17c75 Merge branch 'master' into mytouch 2019-03-28 15:48:25 +08:00
srinathtm-apple d198a8fa67 Merge pull request #1256 from yo1995/ORKSkinFix
Ork skin fix
2019-03-24 11:27:15 -07:00
Duke Mobile Center 77aa2444a2 clean comments 2019-03-24 13:01:44 -04:00
Duke Mobile Center 281b2093b1 #1255 solved the mapHeight metric and other compatibility issues. 2019-03-24 12:55:19 -04:00
srinathtm-apple 94c2b68e53 Merge pull request #1247 from srinathtm-apple/dBHLUpdates
dBHL Tone Audiometry updates
2019-02-26 18:42:30 -08:00
Srinath Tupil Muralidharan 99e3b370d5 if user taps during the preStimulusDelay, do not count it towards threshold calculation 2019-02-26 18:06:06 -08:00
srinathtm-apple 093513f01f Merge pull request #1241 from srinathtm-apple/splMeterUpdates
bugfixes for splmeter
2019-02-23 10:11:33 -08:00
srinathtm-apple 5e39fffe0d Merge pull request #1246 from rsanchezsaez-apple/rss/project-hardening-d
[Misc] Homogenize errorOut argument naming
2019-02-23 10:08:49 -08:00
Ricardo Sanchez-Saez 0ddd16b202 [Misc] Homogenize errorOut argument naming 2019-02-21 16:38:57 -08:00
David Evans 13fdd71613 Merge pull request #5 from ResearchKit/master
merge upstream
2019-02-21 12:26:25 +00:00
srinathtm-apple d000f5b45e Merge pull request #1245 from ResearchKit/rss/project-hardening-c
[Project Hardening] Improvements (III)
2019-02-20 23:40:02 -08:00
Ricardo Sanchez-Saez 19de603340 [ORKTaskViewController] More compact nil UUID check 2019-02-20 18:18:04 -08:00
Ricardo Sanchez-Saez 61af3f9b19 [ORKTaskViewController] Remove unneeded implementation 2019-02-20 18:12:44 -08:00
Ricardo Sanchez-Saez f614fda7b3 [Misc] Add a space before every ‘nil’ 2019-02-20 18:00:38 -08:00
Ricardo Sanchez-Saez 63fb484f22 [ORKSpeechRecognitionResult] Fix typo 2019-02-20 18:00:35 -08:00
Ricardo Sanchez-Saez 6e61d4f79b [ORKConsentSection] Remove unneeded import 2019-02-20 18:00:28 -08:00
Ricardo Sanchez-Saez 54feccdcff [ORKValuePicker] Undo unneeded changes 2019-02-20 17:59:51 -08:00
Ricardo Sanchez-Saez 5bc0088f16 [ORKVisualContentStepViewController] Better nullability handling 2019-02-20 17:59:44 -08:00
Ricardo Sanchez-Saez e4f7516b6f [ORKTintedImageView] Remove unneeded changes 2019-02-20 17:59:34 -08:00
Ricardo Sanchez-Saez 61290e42fa [ORKTintedImageView] Remove unneeded nullability 2019-02-20 17:59:26 -08:00
Ricardo Sanchez-Saez 82720f2978 [ORKPDFViewerStepView] Add default nullability 2019-02-20 17:59:17 -08:00
Ricardo Sanchez-Saez 08af95d3a7 [ORKTaskViewController] Better UUID nullability 2019-02-20 17:59:14 -08:00
Ricardo Sanchez-Saez 319b9f189e [ORKTableStepViewController] Better nullability 2019-02-20 17:59:10 -08:00
Ricardo Sanchez-Saez d6f71e2cdb [ORKStepNavigationRule] Improve comment 2019-02-20 17:59:02 -08:00
Ricardo Sanchez-Saez 92c2299a9d [ORKSkin] Remove unused code 2019-02-20 17:58:50 -08:00
Ricardo Sanchez-Saez ddb2c50aba [ORKReviewStep] Add braces for safety 2019-02-20 17:58:23 -08:00
Ricardo Sanchez-Saez 4d7c27a1dd [ORKReviewStep] Add extra nullable annotations 2019-02-20 17:58:20 -08:00
Ricardo Sanchez-Saez 2e0bef5490 [ORKPicker] Better nullability fix, remove unused function 2019-02-20 17:58:15 -08:00
Ricardo Sanchez-Saez 222855fabc [Misc] Nicer variable names 2019-02-20 17:58:12 -08:00
Ricardo Sanchez-Saez 97a503cf18 [ORKMultiValuePicker] Better nullability fix 2019-02-20 17:57:51 -08:00
Ricardo Sanchez-Saez 15b6204a9e [Misc] Rename findInArrayByKey to ORKFindInArrayByKey 2019-02-20 17:57:47 -08:00
Ricardo Sanchez-Saez 6f883b4acb [ORKHealthAnswerFormat] Better static analyzer fixes 2019-02-20 17:57:42 -08:00
Ricardo Sanchez-Saez 762d0350c4 Update comment to reflect code 2019-02-20 17:57:32 -08:00
Ricardo Sanchez-Saez ea01dbdbc3 Remove unneeded check 2019-02-20 17:57:24 -08:00
Ricardo Sanchez-Saez 363a1f7caa [ORKDateTimePicker] Better nullability test 2019-02-20 17:57:18 -08:00
Ricardo Sanchez-Saez 81b945a129 [ORKHealthAnswerFormat] Better nullability issue fix 2019-02-20 17:57:13 -08:00
Ricardo Sanchez-Saez 16a5da4566 [ORKGraphChartView] Simpler fix for shadowing variable declaration 2019-02-20 17:57:10 -08:00
Ricardo Sanchez-Saez 1c2af3c669 [ORKGraphChartView] Simpler fix for shadowing variable declaration 2019-02-20 17:57:06 -08:00
Ricardo Sanchez-Saez b412f47578 Rename ORKLineGraphAccessibilityElement to ORKGraphChartAccessibilityElement 2019-02-20 17:56:59 -08:00
Ricardo Sanchez-Saez d9cfb03dc6 [ORkGraphChartView] Fix wrong accessibility fix 2019-02-20 17:56:53 -08:00
Ricardo Sanchez-Saez 4baa86df01 [ORKGraphChartView] Remove unneeded change 2019-02-20 17:56:48 -08:00
Ricardo Sanchez-Saez c0c512b9ad [ORKStroopStepViewController] Change NSMutableDictionaries to NSDictionaries 2019-02-20 17:56:43 -08:00
Ricardo Sanchez-Saez 95d82db7cf [ORKAudioContentView] Do no set unneeded _timerLabel initial text 2019-02-20 17:56:24 -08:00
Ricardo Sanchez-Saez 66dbac3bb7 [Localization] Continue retuning ‘nil’ when the slider is not found 2019-02-20 17:56:20 -08:00
srinathtm-apple d969d55ab1 Merge pull request #1244 from rsanchezsaez-apple/rss/project-hardening-b
[Project Hardening] Improvements (II)
2019-02-20 17:51:09 -08:00
srinathtm-apple 95e8250194 Merge pull request #1243 from rsanchezsaez-apple/rss/project-hardening-a
[Project Hardening] Improvements (I)
2019-02-20 17:50:53 -08:00
Ricardo Sanchez-Saez 2539157e47 [Project] Disable “Missing Localization Context Comment” from static analyzer 2019-02-20 17:02:56 -08:00
Ricardo Sanchez-Saez a51b85622a [Project] Update project languages appropriately 2019-02-20 17:02:13 -08:00
Ricardo Sanchez-Saez 1e25391b0a Revert "[code cleanup] Add missing localization comments (issue #1214)"
This reverts commit c2b664f3b8.

# Conflicts:
#	ResearchKit/ActiveTasks/ORKAudioContentView.m
2019-02-20 16:57:14 -08:00
Ricardo Sanchez-Saez 9cc6255b45 [ORKSample] Update to Swift 4 2019-02-20 16:52:48 -08:00
Ricardo Sanchez-Saez 112bb1b7fa [ORKTest] Update to Swift 4 2019-02-20 16:52:38 -08:00
Ricardo Sanchez-Saez 041d015dbf [Project] Run static analyzer, in deep mode, only when building in Debug 2019-02-20 16:50:25 -08:00
Ricardo Sanchez-Saez 877edca1e6 [Project] Remove unsupported Swift 3.0 specifier from project 2019-02-20 16:50:16 -08:00
srinathtm-apple c7b2c33a29 Merge pull request #1216 from bgannin/projectHardening
Project hardening
2019-02-20 16:07:29 -08:00
srinathtm-apple ca1a18978f check if error is non-NULL before assignment 2019-02-18 20:24:30 -08:00
srinathtm-apple 0a962c6822 using NSInteger instead of NSUInteger 2019-02-18 17:56:49 -08:00
srinathtm-apple f07ae4b8f0 logical-or the missing super calls in ORKLocationSelectionView 2019-02-18 17:19:33 -08:00
srinathtm-apple b0d7eff709 logical-or the missing super calls 2019-02-18 17:16:49 -08:00
Srinath Tupil Muralidharan 390c02d2a8 bugfixes for splmeter 2019-02-14 12:25:46 -08:00
Tommy Lin 233142920f Merge master into mytouch 2019-02-14 17:10:44 +08:00
srinathtm-apple a4a147332d Merge pull request #1236 from jayway/email_fix
Fixed email regex to enforce start and end of string.
2019-02-04 08:57:26 -08:00
Gustaf Nilklint f1fdddf5d4 Fixed email regex to enforce start and end of string to eliminate the possibility to accidentally accept white space in the email adress. 2019-02-04 15:09:52 +01:00
Tommy Lin 489de1d8aa Fix ORKBorderedButton background color issue 2019-02-02 22:50:36 +08:00
Tommy Lin 52578e21fe Add internationalization strings 2019-01-28 16:26:08 +08:00
srinathtm-apple 92fc374b46 Merge pull request #1224 from srinathtm-apple/AttributedTextForSurveys
attributed text for surveys
2019-01-18 16:50:47 -08:00
Srinath Tupil Muralidharan c87b189f8a moving the assert to the designated initializer 2019-01-18 16:45:21 -08:00
Srinath Tupil Muralidharan b7cf4bc918 adding an assert if all the input params are nil 2019-01-18 16:39:51 -08:00
srinathtm-apple b803c3aab0 Merge pull request #1232 from aplummer-apple/tidy-onboarding
Minor example project onboarding cleanup
2019-01-18 15:58:56 -08:00
aplummer-apple 3094ba675c Update ORKSpatialSpanMemoryStepViewController.m 2019-01-18 15:51:23 -08:00
Andrew Plummer 88b7c9a68f Minor example project onboarding cleanup
- Tidy up localized strings
- Remove unused language config
- Delegate reference cycle
- Tidy signature access at end of onboarding

Minor syntax tidy

Minor Tidy, remove redundant check

Minor tidy, remove unnecessary variable

Minor tidy, clearer call

Fix broken “Disagree” button in example onboarding consent flow

Previously the flow let you progress as usual even if you select “disagree”

Remove development team

Clean whitespace
2019-01-10 18:38:34 -08:00
Tommy Lin 06e1e9bbfc Remove useless code 2019-01-08 14:50:11 +08:00
Srinath Tupil Muralidharan 36b8a72056 renaming an internal function 2019-01-07 17:44:10 -08:00
Srinath Tupil Muralidharan 111b983716 account for case where text is nil but primaryTextAttributedString is non-nil 2019-01-07 15:49:53 -08:00
Srinath Tupil Muralidharan 599a723dd1 call designated initializer using self 2019-01-07 15:14:03 -08:00
Srinath Tupil Muralidharan 7f37428426 support attributedText in ORKMultipleValuePickerAnswerFormat 2019-01-07 13:59:50 -08:00
Srinath Tupil Muralidharan 630a431299 support attributedText in textScaleAnswerFormat 2019-01-07 13:22:17 -08:00
Srinath Tupil Muralidharan ab081e28e1 ensure that attributedText always overrides text 2019-01-07 12:18:30 -08:00
Tommy Lin 8b912b7d25 Add touch ability instruction art works 2019-01-04 19:02:04 +08:00
Tommy Lin 375e1380d7 Add instructions before every touch ability tasks 2019-01-03 18:05:42 +08:00
Tommy Lin fdd3d7c653 Modify scroll task design 2019-01-02 20:33:42 +08:00
Tommy Lin 18ea1236e2 Rename ORKTouchAbilityScrollStep 2019-01-02 16:34:30 +08:00
Tommy Lin 18842a0e64 Add target hint label to ORKTouchAbilityScrollContentView 2018-12-25 17:13:27 +08:00
Tommy Lin 7a3d0606d5 Reset gesture recognizer events after reset tracks 2018-12-25 15:43:52 +08:00
Tommy Lin 528186535c Rename -[ORKTouchAbilityContentView startTracking] to -[ORKTouchAbilityContentView startTrial]
And also  -[ORKTouchAbilityContentView stopTracking] to  -[ORKTouchAbilityContentView endTrial]
2018-12-25 15:26:08 +08:00
Tommy Lin bd4c1a1568 Add start date and end date to ORKTouchAbilityTrial 2018-12-25 15:20:41 +08:00
Tommy Lin 08382cf7a3 Override some touch ability model descriptions 2018-12-24 19:24:01 +08:00
Tommy Lin 1080e4f08d Add ORKTouchAbilityTaskOption 2018-12-24 17:10:37 +08:00
Tommy Lin 81c9fd83e3 Refine scroll trial view 2018-12-24 16:51:13 +08:00
Tommy Lin f65b22993b Update some constraints 2018-12-24 16:37:11 +08:00
Tommy Lin e9059ee42c Add touch ability scroll ability models, views and view controllers 2018-12-22 16:48:52 +08:00
Tommy Lin f4feaffe19 Rename some protocol name and methods 2018-12-21 17:16:23 +08:00
Tommy Lin 176da46dd4 Replace auto layout codes using anchor API with traditional API 2018-12-21 17:07:26 +08:00
Tommy Lin e4a023713d Refine touch ability arrow view 2018-12-20 18:16:38 +08:00
Tommy Lin 7cfc964143 Refine pinch and rotation content view and step view controller 2018-12-20 17:40:27 +08:00
Tommy Lin b4b363cac6 Refine swipe content view and tap step view controller 2018-12-20 17:10:00 +08:00
Tommy Lin 3deaee1ef0 Refine long press content view and tap step view controller 2018-12-20 16:39:55 +08:00
Tommy Lin 330587f6f8 Refine tap content view and tap step view controller 2018-12-20 16:28:22 +08:00
Tommy Lin 7615ed631d Refine ORKTouchAbilityCustomView 2018-12-20 15:46:27 +08:00
Tommy Lin 567c1802ba Add rotation task models, views and controller 2018-12-19 17:50:21 +08:00
Tommy Lin 400ba05d8e Add pinch task models, views and controller 2018-12-17 14:36:34 +08:00
Srinath Tupil Muralidharan 3cd8cd7661 display attributed strings in picker view 2018-12-13 21:10:53 -08:00
Srinath Tupil Muralidharan 612b411dc2 adding support to provide attributed string for both primary text and detail text in ORKAnswerFormat 2018-12-13 21:10:20 -08:00
Srinath Tupil Muralidharan cd216ab1c0 setting attributed text to nil seems to override other UILabel properties, adding checks before assigning 2018-12-13 16:21:53 -08:00
Srinath Tupil Muralidharan 610d30fb0a adding support for setting attributed string to the primary text label of ORKAnswerFormat 2018-12-12 18:34:34 -08:00
Tommy Lin f81825bb78 Add touch ability swipe task 2018-12-05 18:28:32 +08:00
Tommy Lin eb5c34b35a Complete touch ability long press controller and models 2018-12-05 13:42:17 +08:00
Tommy Lin 7ea163bc14 Add property "success" to ORKTouchAbilityTapTrial 2018-12-05 13:21:38 +08:00
srinathtm-apple acc45033b7 Merge pull request #1222 from srinathtm-apple/CleanupPR1088
Cleanup for knee and shoulder range of motion
2018-12-04 17:33:47 -08:00
Srinath Tupil Muralidharan aa5bfa8142 pointing to the renamed assets for the task 2018-12-04 17:22:27 -08:00
srinathtm-apple 070950b31a Merge pull request #1088 from davwillev/master
Changes to angle calculations in Range of Motion active tasks
2018-12-04 15:16:52 -08:00
srinathtm-apple 981c1af7a8 Update ORKRangeOfMotionResult.h
adding new line spacing..
2018-12-04 13:55:36 -08:00
Tommy Lin 2cbf211613 Refine touch ability touch tracker 2018-12-04 15:33:06 +08:00
Tommy Lin 77de9ddf05 Refine touch ability tap step view controller 2018-12-04 14:58:30 +08:00
srinathtm-apple 1dfca472e2 Merge pull request #1213 from stevebaranski/issue/contributing
Correct link to ResearchKit forum in contributing guidelines
2018-12-03 13:15:23 -08:00
Tommy Lin 4b9dc94927 Add touch ability long press step, view, controller and result 2018-11-30 17:15:57 +08:00
Tommy Lin f3eec95c98 Refine tap task behavior 2018-11-30 16:10:00 +08:00
Tommy Lin 005b4b744f Refine ORKTouchAbility models 2018-11-29 17:16:51 +08:00
Tommy Lin 002939a0ec Refine property attributes 2018-11-28 17:08:00 +08:00
Brian Ganninger 35e5d5aa95 [code cleanup] Review mismatched nil returns, part II (issue #1214) 2018-11-27 22:18:03 -08:00
Brian Ganninger 547e1b5cd2 [code cleanup] Use local variable across autorelease pools (issue #1214) 2018-11-27 22:05:43 -08:00
Brian Ganninger 421e90615f [code cleanup] Resolve semantic issue with navigation buttons (issue #1214) 2018-11-27 20:40:23 -08:00
Tommy Lin 3538a50e55 Implement tap task trial points generator 2018-11-27 18:14:53 +08:00
Brian Ganninger 30a758e2b7 Tweak build settings a bit (issue #1214)
// implicit self retain in blocks, priority inversion are larger issues to tackle
2018-11-27 01:09:52 -08:00
Brian Ganninger 9ef1876c45 [code cleanup] Review mismatched nil returns (issue #1214) 2018-11-27 00:52:51 -08:00
Tommy Lin b06ffbb44e Refine code structure 2018-11-27 16:46:16 +08:00
Brian Ganninger 60076032b9 [code cleanup] Use defined enum values (issue #1214) 2018-11-25 19:12:15 -08:00
Brian Ganninger c2b664f3b8 [code cleanup] Add missing localization comments (issue #1214) 2018-11-25 13:08:51 -08:00
Brian Ganninger fc61990e03 [code cleanup] Address missing prototypes for functions (issue #1214) 2018-11-24 21:39:47 -08:00
Brian Ganninger ca81287311 [code cleanup] Resolve shadow declarations (issue #1214) 2018-11-24 19:33:28 -08:00
Brian Ganninger db995e3b35 [code cleanup] Fix dead code stores (issue #1214) 2018-11-24 17:46:16 -08:00
Brian Ganninger 1a902eefdd [code cleanup] Security fixes for random, loop counter (issue #1214) 2018-11-24 17:32:31 -08:00
Brian Ganninger 5c3fe6eaef [code cleanup] Fix unknown pragmas (issue #1214) 2018-11-24 17:27:06 -08:00
Brian Ganninger a033e1cc5e [code cleanup] Remove extraneous semicolons (issue #1214) 2018-11-24 15:42:54 -08:00
Brian Ganninger fbb7892ea6 [code cleanup] Add missing newlines (issue #1214) 2018-11-24 15:36:33 -08:00
Brian Ganninger 336096f680 [code cleanup] Fix memory management/mutability mismatch (issue #1214) 2018-11-24 01:13:05 -08:00
Brian Ganninger f3929e0e12 [code cleanup] Resolve generics type mismatch (issue #1214) 2018-11-24 01:10:20 -08:00
Brian Ganninger 3736cf573e [code cleanup] Resolve missing super calls (issue #1214) 2018-11-24 00:55:43 -08:00
Brian Ganninger 336ab0e21b Enable a swath of new compiler and analyzer flags and shallow analyze on build 2018-11-24 00:49:40 -08:00
Brian Ganninger 6459a4a5a0 Merge pull request #1 from ResearchKit/master
Merge ORK-latest
2018-11-21 15:38:04 -08:00
Tommy Lin d04c38b4a0 Add target view in ORKTouchAbilityTapContentView 2018-11-20 18:27:48 +08:00
stevebaranski 535cec7f08 Correct link to ResearchKit forum in contributing guidelines 2018-11-19 10:21:41 -08:00
Tommy Lin 843895e1e4 Add ORKTouchAbilityCustomView 2018-11-13 18:30:54 +08:00
Tommy Lin fe29159d14 Add ORKTouchAbilityTouchTracker 2018-11-13 16:31:39 +08:00
srinathtm-apple 7c883966d0 Merge pull request #1200 from bgannin/chartFontCustomization
Chart font customization
2018-11-10 13:12:26 -08:00
srinathtm-apple 332c8299fa Merge pull request #1210 from srinathtm-apple/runUnitTests
run unit tests on iPhone X iOS12.0 simulator
2018-11-08 17:27:42 -08:00
Srinath Tupil Muralidharan 120612cae0 run unit tests on iPhone X iOS12.0 simulator 2018-11-08 17:12:38 -08:00
srinathtm-apple dbb525a469 Merge pull request #1188 from CareEvolution/field-content-types
Add support for textContentType from UITextInputTraits to ORKAnswerFormat
2018-11-08 13:32:51 -08:00
Tommy Lin 4dea6d8a7b Make ORKTouchAbilityTouch, ORKTouchAbilityTrack, ORKTouchAbilityGestureRecognizer and ORKTouchAbilityTrial confirm to NSCopying and NSSecureCoding 2018-11-08 15:52:22 +08:00
srinathtm-apple c57d3a1e1f Merge pull request #1107 from rsanchezsaez/rsanchezsaez/optional-pie-legend
[ORKPieChartView] Allow skipping segment legend labels
2018-11-07 14:30:01 -08:00
Tommy Lin 77a15aa734 Add ORKTouchAbilityTrial class 2018-11-07 16:27:57 +08:00
srinathtm-apple aa482452e0 Merge pull request #1209 from srinathtm-apple/FixForIssue1205
fix for issue #1205
2018-11-06 21:09:17 -08:00
Srinath Tupil Muralidharan f1f322d442 fix for issue #1205 2018-11-06 20:56:55 -08:00
Tommy Lin 8191a977b7 Add basic touch ability data models, views and view controller 2018-11-06 15:39:16 +08:00
srinathtm-apple 54c3333b81 Merge pull request #1204 from srinathtm-apple/badgeForBuildStatus
adding badge for CI build status
2018-10-31 13:12:40 -07:00
Srinath Tupil Muralidharan ad755bb222 adding badge for CI build status 2018-10-31 13:06:52 -07:00
srinathtm-apple 920127d096 Merge pull request #1199 from susom/replace_deprecated_uiwebview
Replace deprecated UIWebView
2018-10-30 17:19:25 -07:00
srinathtm-apple 2696f2377b Merge pull request #1192 from bgannin/documentationTweak
Documentation tweaks
2018-10-30 16:52:02 -07:00
srinathtm-apple 81fdbdac57 Merge pull request #1187 from bgannin/testFixes
ORKTest unit tests fail
2018-10-30 16:44:17 -07:00
Brian Ganninger dd04625562 Updates per PR review 2018-10-30 16:23:46 -07:00
srinathtm-apple 98e8c8e09a Merge pull request #1185 from tobiasjungnickel/ScreenType_iPhone_MAX_XR
ScreenType iPhone Max & XR
2018-10-29 20:20:02 -07:00
srinathtm-apple 2da27dddd6 Merge pull request #1196 from xldrx/patch-1
Fixing a typo/bug in TaskList.
2018-10-29 20:14:28 -07:00
srinathtm-apple e40be2e5f6 Merge pull request #1201 from srinathtm-apple/setupTravisCI
Setup travis ci
2018-10-29 19:52:11 -07:00
Srinath Tupil Muralidharan 79228e8ab7 switching to ResearchKit unit tests 2018-10-29 18:07:37 -07:00
Srinath Tupil Muralidharan 161149d2df adding .travis.yml file 2018-10-29 17:39:03 -07:00
Brian Ganninger a38561bfed Add font changes for all chart types to ORKTest (issue #1158) 2018-10-27 16:55:40 -07:00
Paweł Kowalczyk 74f44435ef Replace deprecated UIWebView in ORKConsentReviewController 2018-10-26 12:56:12 +02:00
Paweł Kowalczyk 66a754d24f Replace deprecated UIWebView in ORKConsentLearnMoreViewController 2018-10-26 12:54:03 +02:00
Paweł Kowalczyk 258e2623f3 Replace deprecated UIWebView in ORKHTMLPDFWriter 2018-10-26 12:51:22 +02:00
Paweł Kowalczyk 7043316b90 Fix unit tests related to Two Finger Tapping Interval Task 2018-10-26 12:51:08 +02:00
Paweł Kowalczyk fcb980beb8 Fix unit tests related to adding new css style to handle signamture image 2018-10-26 12:46:19 +02:00
Brian Ganninger d186e5c6df Expose graph chart view fonts (issue #1158) 2018-10-24 20:18:00 -07:00
Brian Ganninger 5822caa980 Expose pie chart view fonts (issue #1158) 2018-10-23 22:18:19 -07:00
Sayed Hadi Hashemi bb55a603db Fixing a typo/bug in TaskList.
passcodeTask identifier has to be ".passcodeTask" not ".passcodeStep".
2018-10-21 15:47:01 -05:00
Brian Ganninger a75938f6bb Add flair (badge) for DVCS to README for clarity 2018-10-21 12:09:28 -07:00
Brian Ganninger 23ba6e97a8 Add badge flair for project attributes/status on README 2018-10-19 18:16:07 -07:00
Brian Ganninger 053625a0a1 Add prerequisites to the dependency management doc (fixes issue #1184) 2018-10-19 17:41:29 -07:00
Tobias Jungnickel 682cd83213 adding XS term to screen types for XSMax model 2018-10-18 10:30:04 +02:00
Eric DeLabar 55a2833c6e Address code review comments by @srinathtm-apple 2018-10-17 10:15:15 -04:00
Brian Ganninger c6e2df2a6e Additional cleanup 2018-10-16 23:41:46 -07:00
Brian Ganninger a3b6732406 Remove spurious initializer change; silence surfaced serialization failure properly (PR feedback) 2018-10-16 23:35:58 -07:00
Eric DeLabar d2fade561b Add support for textContentType from UITextInputTraits
* Add support for passwordFormat to support automatic secure passwords
2018-10-16 09:45:43 -04:00
Brian Ganninger ab6600eaf2 Pre-PR cleanup 2018-10-13 18:12:31 -07:00
Brian Ganninger 815f5bf60a Ignore shoulder range of motion step for now as it fails deserialization (issue #1151) 2018-10-13 13:43:28 -07:00
Brian Ganninger e9ecae2720 Minor code tweaks 2018-10-12 23:36:28 -07:00
Tobias Jungnickel c9f49d9f18 adding iPhone Max 2018-10-11 10:06:08 +02:00
srinathtm-apple 73faa2e59f Merge pull request #1182 from MacroYau/feature/cancelable-task
Allow task view controller to be canceled directly
2018-10-11 13:28:33 +05:30
srinathtm-apple 70889a0671 Merge pull request #1181 from bgannin/scaleHideValueLabel
Add option to hide selected value in slider scale (#657)
2018-10-11 13:27:55 +05:30
Brian Ganninger 26101d0068 Fix remaining issues for -testSecureCoding (issue #1151) 2018-10-10 22:23:55 -07:00
Brian Ganninger 340c5abdc0 Minor cleanup 2018-10-09 02:49:16 -07:00
Brian Ganninger 0c121f283b Properly init test data for clinical recorder configuration (issue #1151) 2018-10-08 20:53:50 -07:00
Brian Ganninger f50587eaf4 Add missing nullability keywords 2018-10-08 19:10:06 -07:00
Brian Ganninger fad50b20e0 Fix precision of equality check in speech recognition step (issue #1151) 2018-10-08 19:08:24 -07:00
Brian Ganninger 99be8240b0 Fix initialization and serialization issues for numeric answer format (issue #1151) 2018-10-08 18:14:10 -07:00
Brian Ganninger b6028a9eef Update known exceptions for serialization checking (issue #1151) 2018-10-08 18:09:32 -07:00
Brian Ganninger fcad24f94b Update known exceptions for serialization checking (issue #1151) 2018-10-07 23:31:05 -07:00
Brian Ganninger 211aa5a118 Fix serialization equality test failures (issue #1151) 2018-10-07 22:43:19 -07:00
Brian Ganninger 53842c3231 Fix addResult test failures (issue #1151) 2018-10-07 18:38:05 -07:00
Brian Ganninger b6ab7414fd Fix comment misspelling 2018-10-07 12:53:42 -07:00
Brian Ganninger e56ac6b2e9 Fix test failure by marking phone number related properties not serialized (issue #1151) 2018-10-07 12:52:08 -07:00
Brian Ganninger 0da343ea6f Fix serialization test failure for dB HL tone audiometry onboarding step (issue #1151) 2018-10-07 12:42:24 -07:00
Brian Ganninger 1fc475e826 Fix serialization test failure for Amsler grid result (issue #1151) 2018-10-07 12:29:25 -07:00
Brian Ganninger dc0890233f Rename variable for spelling and clarity 2018-10-07 12:17:37 -07:00
Brian Ganninger 15a8deba02 Fix serialization test failure for health clinical recorder configuration [iOS 12+ only] (issue #1151) 2018-10-07 12:16:28 -07:00
Brian Ganninger ac27b6d8fa Fix serialization test failure for Amsler grid step (issue #1151)
// also align whitespace for several entries
2018-10-06 20:31:30 -07:00
Brian Ganninger 8625fa19d6 Fix serialization test failure for speech recognition step (issue #1151) 2018-10-06 20:18:56 -07:00
Brian Ganninger 6e0a3a5c4a Fix serialization test failure for environment SPL meter result (issue #1151) 2018-10-06 19:17:56 -07:00
Brian Ganninger 388a20a79b Fix serialization test failure for streaming audio recorder configuration (issue #1151) 2018-10-06 16:48:55 -07:00
Brian Ganninger ef0c8d0495 Fix serialization test failure for Environment SPL Meter step (issue #1151) 2018-10-06 13:51:31 -07:00
Brian Ganninger 97fb686ad4 Fix serialization test failure for Speech in Noise step (issue #1151) 2018-10-06 13:50:44 -07:00
Brian Ganninger 2c0a6d7761 Fix serialization test failure for PDF Viewer step (issue #1151) 2018-10-06 13:49:57 -07:00
Brian Ganninger 0070d3ca04 Fix serialization test failure for tone audiometry step (issue #1151) 2018-10-05 23:43:48 -07:00
Macro Yau 6d0c331aba Fix typo 2018-10-05 14:30:21 +08:00
Macro Yau 0d81a9c696 Rename cancelable to discardable 2018-10-05 14:23:49 +08:00
srinathtm-apple 1e7d2c2460 Merge pull request #1179 from MacroYau/feature/custom-minute-interval
Allow custom minute interval setting for UIDatePicker with date and time, and time of day answer formats
2018-10-05 11:13:03 +05:30
Brian Ganninger 3197a62a3a Update TaskFactory+QuestionSteps.m
Fix incorrect comment
2018-10-04 14:57:26 -07:00
Brian Ganninger 4cdffbd061 Consistency cleanup from PR feedback. 2018-10-04 12:46:31 -07:00
Brian Ganninger fad570f6e9 Explicitly initialize per PR feedback 2018-10-04 10:26:10 -07:00
Macro Yau 05e4011f2a Remove unused getters 2018-09-29 18:43:49 +08:00
Macro Yau b28785d160 Allow task view controller to be cancelable regardless of step type 2018-09-28 19:15:13 +08:00
Brian Ganninger 2b25f66086 Remove hideSelectedValue from serialization test after initializer changes 2018-09-27 23:20:02 -07:00
Brian Ganninger 54f7a9b53a Update initializer 2018-09-27 23:13:05 -07:00
Brian Ganninger 0d6bd0e3c4 Whitespace tweak again 2018-09-27 23:11:29 -07:00
Brian Ganninger ed3d787972 Flipped parameters accidentally 2018-09-27 23:10:39 -07:00
Brian Ganninger 834e992bf0 Whitespace fix take 2 2018-09-27 23:09:27 -07:00
Brian Ganninger 4a894d2b3c Whitespace fix 2018-09-27 23:07:32 -07:00
Brian Ganninger 6848c067d0 Remove copyright attribution 2018-09-27 23:04:16 -07:00
Brian Ganninger ff3fe765f1 Remove hideSelectedValue from initializers, utilize only via settable property per PR review. 2018-09-27 23:01:24 -07:00
Macro Yau ecc6d2b6f9 Remove minute interval parameter from constructors 2018-09-27 16:45:50 +08:00
Brian Ganninger 8f633dcb43 Add copyright attribution per guidelines 2018-09-26 19:25:16 -07:00
Brian Ganninger a62b853500 Fix whitespace to match coding guidelines for project 2018-09-26 19:20:36 -07:00
Brian Ganninger 0a12a96af5 Add an extra step for testing text choice scale with no selected value; update serialization tests 2018-09-26 19:13:01 -07:00
Brian Ganninger 62bba0b6c9 Fix whitespace to match coding guidelines for project 2018-09-26 18:51:11 -07:00
Brian Ganninger b7c6772266 Add copyright attribution per guidelines 2018-09-25 22:56:27 -07:00
Brian Ganninger 224ce04a41 Redo initializers and Scale section of OKRTest to include hiding the selected value for all variants (#657) 2018-09-25 22:46:48 -07:00
Macro Yau 05b6f308e3 Allow custom minute interval setting for UIDatePicker with date and time, and time of day answer formats 2018-09-25 14:06:59 +08:00
Brian Ganninger 3f96750424 Port changes from pull request #446 to latest master 2018-09-24 20:33:23 -07:00
srinathtm-apple e7e501c087 Merge pull request #1175 from king7532/master
NSHealthShareUsageDescription must be longer than one word
2018-09-24 20:18:37 -06:00
Benjamin King 3aeb8dd9f9 NSHealthShareUsageDescription must be longer than one word, otherwise HealthKit will throw a runtime exception during the on-boarding or profile view controller 2018-09-19 11:05:31 -04:00
David Evans d30331a403 Slight change to RoM instructions
Made a slight improvement to the wording of the knee and shoulder range of motion tasks, in line with the new 'maximum' and 'minimum' angle calculations, following feedback after testing with volunteers.
2018-09-19 10:03:46 +01:00
David Evans 1726f5353d Trying to resolve file conflict by updating to latest RK version 2018-09-05 09:32:13 +01:00
Srinath Tupil Muralidharan b46a5f4d83 Updating podspec, readme and project settings for ResearchKit 2.0 stable release 2018-09-04 19:30:52 -07:00
Srinath Tupil Muralidharan e1d47c2882 Adding remaining audio files for Speech in Noise to Git LFS 2018-09-04 19:21:11 -07:00
Srinath Tupil Muralidharan dbc21a1c2a Changing lfsconfig to recursively track the LFS-files folder 2018-09-04 19:13:28 -07:00
Srinath Tupil Muralidharan f73645127c Adding proof of concept LFS file for speech in noise 2018-09-04 19:04:17 -07:00
Akshay 95425a81ae Stable Release 2.0 2018-09-04 16:58:27 -07:00
srinathtm-apple 8a44bceb99 Merge pull request #1170 from srinathtm-apple/FixForIssue1168
adding new css style class to handle signature image
2018-09-04 17:19:16 -06:00
Srinath Tupil Muralidharan 543fb892b1 adding new css style class to handle signature image 2018-09-04 16:17:01 -07:00
David Evans e3fad9e1d9 Final changes for angle calculations 2018-09-03 16:41:38 +01:00
David Evans 9f2e77d103 Updated version for consistency with latest RK version 2018-09-03 16:39:18 +01:00
David Evans 0478b552dc Made final changes to knee and shoulder angle calculations 2018-09-03 16:34:58 +01:00
srinathtm-apple 0598cbdbd3 Merge pull request #1167 from srinathtm-apple/FixForIssue1136
navigationFooterView should adopt app tint color
2018-08-28 23:27:29 -06:00
Srinath Tupil Muralidharan c1e6dc0a54 navigationFooterView should adopt app tint color 2018-08-28 17:44:32 -07:00
srinathtm-apple c4968de7d7 Merge pull request #1161 from overcyn/patch-1
Allow autoplay and inline media playback in ORKWebViewStep
2018-08-28 12:12:11 -06:00
srinathtm-apple f02d401737 Merge pull request #1162 from srinathtm-apple/FixForIssue1142
Fix for issue #1142
2018-08-28 12:08:20 -06:00
David Evans 19ee558b57 Adjusted for phone landscape orientation issue
Changed the 'range' result to the absolute difference between maximum and minimum angles, which deals with the problem of the phone being in opposite landscape orientations, and the device recording 'positive' or 'negative ' results accordingly
2018-08-22 12:08:21 +01:00
David Evans 8fde58535b Changed angle results calculations
This needed changes to allow for the negative direction of pitch during knee and shoulder RoM tasks. Counterintuitively, min and max values needed to be exchanged for these particular tasks
2018-08-22 11:49:17 +01:00
Srinath Tupil Muralidharan ec33ec5f8c minor change in import which was causing build failure 2018-08-20 12:42:19 -07:00
Srinath Tupil Muralidharan d23db60948 pass the fhir data object directly to the logger 2018-08-20 12:41:51 -07:00
Kevin Dang fd36ad5463 Update to use latest WKWebView api 2018-08-17 11:51:26 -07:00
Kevin Dang 06360f246d Allow autoplay and inline media playback in ORKWebViewStep 2018-08-16 14:47:39 -07:00
srinathtm-apple 7f1226e74a Merge pull request #1109 from rsanchezsaez/rsanchezsaez/xcode-9.3
[Misc] Fix Xcode 9.3 warnings and rename some methods
2018-08-15 10:46:22 -06:00
srinathtm-apple 0799ec32c9 Merge pull request #1155 from kasemset-apple/trail_making_dynamic_type
Improvements to Dynamic Type support in the Trail Making Test.
2018-08-08 16:09:07 -06:00
srinathtm-apple ae2333f2e4 Merge pull request #1156 from kasemset-apple/tapping_button_ax
Improve usability of tests that use ORKRoundTappingButton.
2018-08-08 16:08:44 -06:00
srinathtm-apple 6da6842adb Merge pull request #1157 from ysf199711/master
Update Consent Doc
2018-08-07 17:35:03 -06:00
srinathtm-apple a016834614 Merge pull request #1139 from joshavant/add-docset
Add docset
2018-08-07 17:33:44 -06:00
Sifan Ye 6d0e6e1931 Apply changes to old document 2018-08-08 02:37:55 +08:00
Sifan Ye 65c5ca082b Added suggested changes
Will update original consent doc
2018-08-08 02:25:01 +08:00
srinathtm-apple a8bbd7d4d8 Merge pull request #1135 from CareEvolution/consentMustScroll
Option to require scrolling to the bottom of ORKConsentReviewStep
2018-08-06 17:53:42 -06:00
Eric Schramm b5cdb5b7fe cond scrollView delegate, check if unscrollable
- minimize callbacks if not needed - make UIScrollViewDelegate only if needed
- if a short consent is used and no scrolling is needed on device, re-enable Agree button
2018-08-06 17:38:34 -05:00
srinathtm-apple 781c080033 Merge pull request #1153 from kasemset-apple/speech_recognition_dynamic_type
Improved Dynamic Type support for the Speech Recognition recording view.
2018-08-06 12:28:13 -06:00
srinathtm-apple cd8e0ebb00 Merge pull request #1152 from kasemset-apple/speech_recognition_transcript_ax
Accessibility fixes for the transcript view in the Speech Recognition task.
2018-08-06 12:27:56 -06:00
Sifan Ye b32c87a3b2 Merge pull request #1 from ResearchKit/master
Merge Updates
2018-08-03 12:21:38 +02:00
srinathtm-apple 9ea3d8bb09 Merge pull request #1150 from kasemset-apple/speech_recognition_waveform_axlabel
Make the waveform accessible so that low vision users are aware that it is present.
2018-08-02 12:38:23 -06:00
srinathtm-apple a1600c6e0b Merge branch 'master' into speech_recognition_waveform_axlabel 2018-08-02 12:37:01 -06:00
Sifan Ye ebc0eeef7d Update pdf code -> swift 2018-08-02 17:47:48 +02:00
Sifan Ye 020b21f261 consentShare -> swift 2018-08-02 17:42:51 +02:00
Sifan Ye 403ef4e6ee Oops, wrong code block 2018-08-02 17:39:45 +02:00
Sifan Ye 74d3f60562 Code block 4 -> swift 2018-08-02 17:37:22 +02:00
Sifan Ye bf3b66e6ff Code block 3 -> Swift 2018-08-02 17:30:12 +02:00
Sifan Ye 9265d45878 Code block 2 -> Swift 2018-08-02 17:22:53 +02:00
Sifan Ye f07c4fe7ff Correct some label typos 2018-08-02 17:11:48 +02:00
Sifan Ye 81e106dde0 First code block -> swift 2018-08-02 17:09:53 +02:00
Sifan Ye cb45004eb0 Init, prepare to replace objc with swift 2018-08-02 16:57:59 +02:00
Sifan Ye f683a494df Update more image formatting and add syntax highlighting 2018-08-02 16:56:31 +02:00
Sifan Ye f7e2e39e1c Update headers and image formats 2018-08-02 16:34:27 +02:00
Sifan Ye 6147283a63 Rename to InformedConsent-template-ObjC.markdown 2018-08-02 16:00:17 +02:00
David Evans c424ada8fd Adjusted 'finish' angle calculation in line with ORKRangeOfMotionStepViewController 2018-08-01 11:55:09 +01:00
Clare Kasemset 2a02e94987 Merge branch 'master' into tapping_button_ax 2018-08-01 17:04:14 +09:00
Clare Kasemset 2be7575a93 Improve usability of tests that use ORKRoundTappingButton.
- In the tone audiometry test, the user has a chance to determine the location of the buttons during the practice step. Once the test begins, the buttons become directly tappable.
- In the two finger tapping interval test, the user can also determine the location of the buttons first. Then on the first activation of either button, the buttons become directly tappable, but the tap is not registered yet.
- In the dBHL tone audiometry test, the user is given instructions about the button and it is directly tappable.
- In the trailmaking test, the user is given instructions about the buttons and they are directly tappable.
2018-08-01 17:01:11 +09:00
Ricardo Sanchez-Saez 326e44b055 [Project] Update to Xcode 9.4 recommended settings 2018-07-31 22:58:26 -07:00
David Evans ba58b4dbad Removed min and max +90.0 adjustment 2018-07-31 22:27:40 +01:00
David Evans 0ee66f6a26 Removed +90.0 adjustment from min and max results 2018-07-31 22:26:34 +01:00
David Evans 261ef01f93 Adjusting maximum and minimum results by +90.0 2018-07-31 21:57:59 +01:00
David Evans f1083cf096 Adjusted minimum and mximum results by +90.0 2018-07-31 21:26:10 +01:00
David Evans 4b5a587eb8 Removed 'fabs' from rangeOfMotionMoreThan180Degrees function 2018-07-31 20:40:02 +01:00
David Evans 4bdd148b53 Removed 'phonesoundwaves' image 2018-07-31 11:42:27 +01:00
David Evans 6bad43fb9f Delete phonesoundwaves_inverted@3x.png 2018-07-31 11:36:29 +01:00
David Evans 34040ac1cd Delete phonesoundwaves_inverted@2x~ipad.png 2018-07-31 11:36:19 +01:00
David Evans 4a58bff1fd Delete phonesoundwaves_inverted@2x.png 2018-07-31 11:36:09 +01:00
David Evans d8391522db Delete Contents.json 2018-07-31 11:34:34 +01:00
Clare Kasemset 4ce1635da5 Improvements to Dynamic Type support in the Trail Making Test.
- Make sure the text doesn't grow outside the bubbles
- Make sure the "Starting text in" text doesn't get truncated
- Scale the timer and error text
2018-07-31 17:44:31 +09:00
Ricardo Sanchez-Saez 26c7884002 [Project] Make ORKHTMLPDFPageRenderer.h private again 2018-07-31 00:59:51 -07:00
Ricardo Sanchez-Saez 3bc160c5b2 [Tests] Fix ResearchKit unit tests 2018-07-31 00:43:51 -07:00
Clare Kasemset 7e21d2486d Improved Dynamic Type support for the Speech Recognition recording view.
- The phrase to be recorded now scales with dynamic type.
- The Start Recording button expands if needed to fill the available width.
2018-07-31 16:39:00 +09:00
srinathtm-apple 1921a72f26 Merge pull request #1149 from kasemset-apple/amsler_grid_direct_touch_ax
Make the Amsler Grid a direct touch area, so the task can be completed easily by low vision users using VoiceOver.
2018-07-31 01:00:14 -06:00
srinathtm-apple ce93665ba2 Merge pull request #1148 from kasemset-apple/speech_in_noise_button_axtraits
Use UIAccessibilityTraitStartsMediaSession on the Play Audio button, so that VoiceOver doesn't speak the button title when you activate it.
2018-07-31 00:59:56 -06:00
srinathtm-apple e7f72ffde2 Merge pull request #1147 from kasemset-apple/speech_recognition_button_axtraits
Use UIAccessibilityTraitStartsMediaSession on the Start Recording button, so that VoiceOver doesn't speak the button title when you activate it.
2018-07-31 00:59:19 -06:00
Clare Kasemset 94a4e8b261 Accessibility fixes for the transcript view in the Speech Recognition task.
- Expose only one element for the text view.
- Expose a custom action to allow dismissing the keyboard.

Resolves rdar://problem/42294608. Tested on iPhone 7 with VoiceOver and Switch Control.
2018-07-31 15:29:51 +09:00
Ricardo Sanchez-Saez f605a10dfb Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez/xcode-9.3 2018-07-30 22:27:33 -07:00
Ricardo Sanchez-Saez aa2fd02c67 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez/optional-pie-legend 2018-07-30 22:21:09 -07:00
David Evans acf5f194f0 Updated calculation for minimum angle 2018-07-30 23:19:46 +01:00
srinathtm-apple 69e2aeb202 Merge pull request #1129 from karimhm/master
Add calls to remove self from the notification center observers after deallocation.
2018-07-30 13:55:37 -06:00
srinathtm-apple ebc948a8cc Merge pull request #1132 from ysf199711/master
Update Chart & Graph Doc
2018-07-30 13:55:02 -06:00
Clare Kasemset 584302cd2f Also add a hint so users know they can simply double tap to end recording. 2018-07-30 13:54:01 +09:00
Clare Kasemset b4bfe14641 Make the waveform accessible so that low vision users are aware that it is present.
Resolves rdar://problem/42294396. Tested on iPhone 7.
2018-07-30 13:48:21 +09:00
Clare Kasemset 57ca376732 Make the Amsler Grid a direct touch area, so the task can be completed easily by low vision users using VoiceOver.
Also give it an appropriate label and hint.

Resolves rdar://problem/42293953. Tested on iPhone 7.
2018-07-30 13:35:25 +09:00
Clare Kasemset bb30966458 Use UIAccessibilityTraitStartsMediaSession on the Play Audio button, so that VoiceOver doesn't speak the button title when you activate it.
Resolves rdar://problem/42294815. Tested on iPhone 7.
2018-07-30 12:53:09 +09:00
srinathtm-apple a40b67f458 Merge pull request #1144 from conorhughes-apple/completion_check_axlabel
Use fixed accessibility label for the completion view.
2018-07-29 20:49:50 -06:00
srinathtm-apple d0897d7166 Merge pull request #1143 from conorhughes-apple/pdf_button_axlabels
Add accessibility labels to PDF Viewer action buttons.
2018-07-29 20:49:28 -06:00
Clare Kasemset 729fc5355a Use UIAccessibilityTraitStartsMediaSession on the Start Recording button, so that VoiceOver doesn't speak the button title when you activate it.
Resolves rdar://problem/42294456. Tested on iPhone 7.
2018-07-30 11:38:00 +09:00
David Evans b83684fac9 Update ResearchKit.strings
Updated instructions for range of motion tasks
2018-07-27 08:50:01 +01:00
David Evans 6ea0e4d248 Update ORKRangeOfMotionStepViewController.m 2018-07-26 23:06:12 +01:00
David Evans f730ed5a00 Update ORKRangeOfMotionStepViewController.m 2018-07-26 23:04:35 +01:00
David Evans 30e5a09c0c Update ORKRangeOfMotionStepViewController.m 2018-07-26 23:03:51 +01:00
David Evans 98e2ae73e4 Add files via upload 2018-07-26 22:38:12 +01:00
David Evans 100f744827 Add files via upload 2018-07-26 22:03:30 +01:00
David Evans 9ea558d233 Delete shoulder_flexed@3x.png 2018-07-26 21:57:58 +01:00
David Evans d3ceaabce0 Delete shoulder_flexed@2x~ipad.png 2018-07-26 21:57:48 +01:00
David Evans cf62288080 Delete shoulder_flexed@2x.png 2018-07-26 21:57:39 +01:00
David Evans a8e541a462 Delete Contents.json 2018-07-26 21:57:29 +01:00
David Evans 3c29db9917 Delete shoulder_extended@3x.png 2018-07-26 21:57:06 +01:00
David Evans 2b682cd197 Delete shoulder_extended@2x~ipad.png 2018-07-26 21:56:57 +01:00
David Evans cf753bea67 Delete shoulder_extended@2x.png 2018-07-26 21:56:48 +01:00
David Evans a4e1d13bad Delete Contents.json 2018-07-26 21:56:37 +01:00
David Evans 268af9b05d Delete shoulder_extended@3x.png 2018-07-26 21:56:19 +01:00
David Evans 9b47a271a4 Delete shoulder_extended@2x~ipad.png 2018-07-26 21:56:10 +01:00
David Evans 8608143e40 Delete shoulder_extended@2x.png 2018-07-26 21:55:59 +01:00
David Evans 01534209ac Delete Contents.json 2018-07-26 21:55:51 +01:00
David Evans ce75fc84bb Delete knee_flexed@3x.png 2018-07-26 21:55:29 +01:00
David Evans 4f1b8e1b89 Delete knee_flexed@2x~ipad.png 2018-07-26 21:55:20 +01:00
David Evans bb6be3bde1 Delete knee_flexed@2x.png 2018-07-26 21:55:11 +01:00
David Evans 52046a60bc Delete Contents.json 2018-07-26 21:55:02 +01:00
David Evans aba6fb5889 Delete knee_flexed@3x.png 2018-07-26 21:54:47 +01:00
David Evans 239ad2d8c9 Delete knee_flexed@2x~ipad.png 2018-07-26 21:54:37 +01:00
David Evans c220e6dfbd Delete knee_flexed@2x.png 2018-07-26 21:54:28 +01:00
David Evans 5d0cfbf9de Delete Contents.json 2018-07-26 21:54:19 +01:00
David Evans 644a563d20 Delete knee_extended@3x.png 2018-07-26 21:54:03 +01:00
David Evans c49ff60d73 Delete knee_extended@2x~ipad.png 2018-07-26 21:53:54 +01:00
David Evans 892713bec4 Delete knee_extended@2x.png 2018-07-26 21:53:45 +01:00
David Evans 60ca971d8e Delete Contents.json 2018-07-26 21:53:34 +01:00
David Evans e8f695ee32 Delete knee_extended@3x.png 2018-07-26 21:53:17 +01:00
David Evans 7941f76033 Delete knee_extended@2x~ipad.png 2018-07-26 21:53:01 +01:00
David Evans f871fafed6 Delete Contents.json 2018-07-26 21:52:51 +01:00
David Evans fbd02ffc59 Delete knee_extended@2x.png 2018-07-26 21:52:41 +01:00
David Evans 371c729a48 Delete shoulder_flexed@3x.png 2018-07-26 21:51:36 +01:00
David Evans 9f9cbd9fee Delete Contents.json 2018-07-26 21:51:21 +01:00
David Evans 1341070411 Delete shoulder_flexed@2x~ipad.png 2018-07-26 21:51:08 +01:00
David Evans ed26df05ae Delete shoulder_flexed@2x.png 2018-07-26 21:50:58 +01:00
David Evans 6583215cda Add files via upload
Added new results to range of motion tasks, and renamed flexed and extended
2018-07-26 21:41:54 +01:00
David Evans c77823dfa8 Add files via upload
Added a new image (phonesoundwaves_inverted) to range of motion tasks.
Added additional spoken instruction to 'tap anywhere' stage in range of motion tasks.
2018-07-26 21:36:39 +01:00
David Evans ec62232d9f Add files via upload 2018-07-26 21:28:45 +01:00
David Evans a54a266335 Add files via upload 2018-07-26 21:27:29 +01:00
David Evans 734e85ead6 Add files via upload
Added new results
2018-07-26 21:24:04 +01:00
David Evans 5182776e1f Add files via upload 2018-07-26 21:17:44 +01:00
David Evans 57f896b86f Add files via upload 2018-07-26 21:14:56 +01:00
David Evans abea94060e Update ORKRangeOfMotionStepViewController.m 2018-07-26 17:31:26 +01:00
David Evans 8a21932d62 Update ORKRangeOfMotionStepViewController.m 2018-07-26 17:30:48 +01:00
David Evans 07469cf2c1 Update ORKRangeOfMotionStepViewController.m 2018-07-26 17:28:43 +01:00
David Evans b684c9f2f8 Update ORKRangeOfMotionStepViewController.m 2018-07-26 17:27:56 +01:00
Ricardo Sanchez-Saez d58ac3982c [ORKTowerOfHanoiStep] Fix warning by removing unallowed init 2018-07-25 23:36:20 -07:00
Conor Hughes fbdca00cf2 Use fixed accessibility label for the completion view.
The completion view looks like it's now just always a check in a blue
circle. Update the label to a fixed string. This avoids interpolating
nil, which was happening because captionLabel is not visible here (and
as such moving focus to it with a screen change is also inappropriate).

Resolves rdar://problem/42294298. Tested on iPhone 8.
2018-07-24 19:52:18 -07:00
Conor Hughes 49677ea0f8 Add accessibility labels to PDF Viewer action buttons.
Resolves rdar://problem/42255725. Tested on iPhone 8.
2018-07-24 19:17:57 -07:00
Josh Avant a00a237c29 Add docset 2018-07-23 19:30:47 -05:00
Shannon Young caed724ce2 Merge pull request #1137 from tobiasjungnickel/ScreenType_iPad_10_5
ScreenType for iPad 10.5
2018-07-23 09:08:20 -07:00
Tobias Jungnickel cbd1ccb13d adding iPad 10.5 2018-07-21 12:12:36 +02:00
Eric Schramm fa23b2a841 reverted back to original initializer 2018-07-18 13:38:03 -05:00
Eric Schramm d853c54935 adjusted for backwards compatibility
- restored initial initializer as a convenience initializer
- fixed documentation text to address new parameter
2018-07-17 15:30:07 -05:00
Eric Schramm 8c0236e33a implement requires scroll to bottom to agree 2018-07-17 07:44:47 -05:00
srinathtm-apple ac18d816ee Merge pull request #1134 from anaglik/cocoapods-fix
Fixed position of ORK_CLASS_AVAILABLE
2018-07-13 16:34:30 -06:00
Andrzej Naglik 143184f792 Fixed position of ORK_CLASS_AVAILABLE. 2018-07-13 16:38:41 +02:00
Sifan Ye 6beb7bfbf1 Comment indentation 2018-07-11 01:07:35 +02:00
Sifan Ye b2707702f1 Indentation 2018-07-11 01:06:52 +02:00
Sifan Ye 1e87138b9a Update syntax in code example 2018-07-11 01:06:09 +02:00
Sifan Ye 91c6e0e7da Added how to update a chart graph 2018-07-11 01:00:06 +02:00
Sifan Ye 5c6e8662c5 Remove Fig Captions
where the line above the figure is clear enough to explain
2018-07-11 00:46:25 +02:00
Sifan Ye 25444b68fd Update ChartsAndGraphs-template.markdown 2018-07-11 00:41:44 +02:00
Sifan Ye d9f2e1171e Update ChartsAndGraphs-template.markdown 2018-07-11 00:41:19 +02:00
Karim H 101e792254 Add calls to remove self from the notification center observers after deallocation. 2018-07-08 20:58:25 +01:00
Akshay 266b9f1c71 updating ResearchKit 2.0 Release notes 2018-06-04 16:20:42 -07:00
Akshay dcae4e5775 adding ResearchKit 2.0 Release notes 2018-06-04 16:17:31 -07:00
Akshay edc9f445ab ResearchKit 2.0 2018-06-04 14:24:57 -07:00
Akshay a23a22f7bf Merging updates 2018-06-04 14:03:29 -07:00
srinathtm-apple aea49a7950 Merge pull request #1104 from srinathtm-apple/toneAudiometryCleanup
ORKToneAudiometry cleanup
2018-04-12 21:19:31 -07:00
Srinath Tupil Muralidharan e7a74e4951 updating property in predefined active tasks 2018-04-12 21:17:29 -07:00
Srinath Tupil Muralidharan 78ac8e03f2 renaming bool property per objc conventions 2018-04-12 21:09:28 -07:00
David Evans acc5ff2ba9 Update ORKRangeOfMotionStepViewController.m 2018-04-05 22:20:47 +01:00
David Evans 28d431c664 Update ORKRangeOfMotionStepViewController.m 2018-04-05 22:18:03 +01:00
Ricardo Sanchez-Saez 9f980e1144 [Tests] Fix ORKHTMLPDFWriter tests 2018-04-05 00:22:06 -07:00
Ricardo Sanchez-Saez 259446fc8c [Misc] Rename methods to be more Obj-C compliant 2018-04-04 23:56:40 -07:00
Ricardo Sanchez-Saez 95223d3011 [Projects] Update Swift version to 4.0 2018-04-04 23:31:34 -07:00
Ricardo Sanchez-Saez b61f071020 [Xcode 9.3] Update all projects to avoid warnings 2018-04-04 22:50:24 -07:00
Ricardo Sanchez-Saez be31c5784d [ORKHTMLPDFWriter] Fix nullability warning and rename method 2018-04-04 22:26:01 -07:00
Ricardo Sanchez-Saez 14f8d7ee6c [Xcode 9.3] Add new shared data file 2018-04-04 22:16:41 -07:00
Ricardo Sanchez-Saez b32f3db623 [ORKHTMLPDFPageRenderer] Fix warning 2018-04-04 22:16:22 -07:00
Ricardo Sanchez-Saez 19a3cd7074 [ORKPieChart] Fix delegate optionality 2018-04-04 22:01:37 -07:00
Ricardo Sanchez-Saez fe8f0a2234 [ORKPieChart] Reuse more code 2018-04-04 21:57:27 -07:00
srinathtm-apple 4b9c70ed73 Merge pull request #1103 from srinathtm-apple/FixForIssue1102
fix for issue #1102
2018-04-04 15:08:23 -07:00
Ricardo Sanchez-Saez 5592966027 [ORKPieChartView] Allow skipping segment legend labels 2018-04-04 03:20:43 -07:00
Srinath Tupil Muralidharan a9a0946c7e removing duplicate code 2018-04-03 20:18:44 -07:00
Srinath Tupil Muralidharan 8ff4db8384 fix for issue #1102 2018-04-03 01:33:24 -07:00
srinathtm-apple 4019c380eb Merge pull request #1093 from srinathtm-apple/FixForIssue1014
fix for #1014
2018-03-22 03:02:43 -07:00
Srinath Tupil Muralidharan fe7fc48901 fix for #1014 2018-03-19 13:53:43 -07:00
srinathtm-apple 7634eabd0a Merge pull request #1090 from srinathtm-apple/FixForIssue1022
fix for #1022
2018-03-16 15:51:58 -07:00
srinathtm-apple 3089a3bef5 Merge pull request #1075 from srinathtm-apple/timedWalkTaskCleanup
Timed walk task cleanup
2018-03-12 10:58:40 -07:00
Srinath Tupil Muralidharan cc3afe5102 include turnAroundTimeStep only for positive values 2018-03-12 10:50:22 -07:00
srinathtm-apple d75ba09918 Merge pull request #1092 from MacroYau/patch/passcode-input-overflow
Suppress ORKPasscodeTextField input overflow
2018-03-12 10:32:52 -07:00
Macro Yau 5376359c1f Suppress ORKPasscodeTextField input overflow 2018-03-10 15:11:16 +08:00
Srinath Tupil Muralidharan 9102800ced fix for #1022 2018-03-07 12:14:46 -08:00
David Evans 3133dd38df Merge pull request #1 from davwillev/davwillev-patch-1
Changes to angle calculations in Range of Motion active tasks
2018-03-05 13:28:28 +00:00
David Evans bd8ca78ed1 Add files via upload
Added quaternion to Euler definitions for Roll and Yaw.
Replaced the attitude.roll implementation for the device in landscape orientation with the quaternion for Roll.
Modified the calculation for 'flexed' and 'extended' angles.
2018-03-05 13:21:18 +00:00
srinathtm-apple 92fdcf46a6 Merge pull request #1065 from akshay-yadav-apple/defaultAnswerProperty
Adding default answer property to ORKTextAnswerFormat and ORKNumericA…
2018-03-04 22:42:57 -08:00
srinathtm-apple 2134d5fe3a Merge pull request #1081 from srinathtm-apple/consentSignatureFix
fix for #1071
2018-03-04 22:28:40 -08:00
srinathtm-apple 44a5e21fd0 Merge pull request #1080 from susom/Fix-For-1019-Toolbar
[ResearchKit] fix for issue #1019 - toolbar
2018-02-23 12:56:11 -08:00
Srinath Tupil Muralidharan 2aa0463673 fix consent name and date layout 2018-02-21 15:20:16 -08:00
Paweł Kowalczyk f39f8b01a5 [ResearchKit] fix for issue #1019 - toolbar 2018-02-21 23:05:51 +01:00
akshay-yadav-apple b28b37c4ed Merge pull request #1062 from ninoguba/picker_dynamic_type
Added support for Dynamic Types to answer formats that use picker views
2018-02-21 02:26:15 -08:00
akshay-yadav-apple d7ddf072aa Merge pull request #1074 from srinathtm-apple/FixForIssue1073
Fix for issue 1073: error in localization
2018-02-21 02:23:58 -08:00
Srinath Tupil Muralidharan 0610718029 using non-localized string as value, based on feedback 2018-02-20 01:42:52 -08:00
Srinath Tupil Muralidharan 2d4b6a566a any negative value will bypass turnAroundTime step 2018-02-20 01:42:13 -08:00
srinathtm-apple b71a07c108 Merge pull request #1069 from Br35Ba56/master
Added phone number form item for ORKRegistrationStep #1068
2018-02-20 01:26:47 -08:00
Srinath Tupil Muralidharan 16bb829e6a create an array of ORKTextChoice instead of an array of NSString 2018-02-19 18:52:05 -08:00
Srinath Tupil Muralidharan 65985167c0 deprecating one of the initializers for timedWalkTask to avoid duplicate code paths 2018-02-19 18:14:40 -08:00
srinathtm-apple 0f0e95473a Merge pull request #1064 from CareEvolution/camera-layout
Make the ORKImageCaptureCameraPreviewView take the full width of the screen.
2018-02-19 15:21:37 -08:00
akshay-yadav-apple 0032b6708a Merge pull request #1067 from danielemden/bugs/ShowTimeLeftLabelForAudioTask
Show time-left-label for audio task
2018-02-19 15:21:14 -08:00
Srinath Tupil Muralidharan 425b858206 reverting to using ternary operator to determine key based on limb type 2018-02-19 14:50:10 -08:00
Anthony Schneider 5787764eaf Added .includePhoneNumber to ORKCatalog accountCreationTask. 2018-02-14 20:04:48 -06:00
Anthony Schneider b829641bd0 Issue #1068 Added option for phone number to ORKRegistrationStep. 2018-02-14 19:53:16 -06:00
Daniel Emden ac7cab60dd Show time-left-label for audio task
Probably due to a typo. The formatter which is used to format the string showing the remaining time for the audio task is always nil.
2018-02-13 23:41:09 +01:00
Akshay 5fe7c7f49e Adding default answer property to ORKTextAnswerFormat and ORKNumericAnwerFormat 2018-02-12 15:26:57 -08:00
Kevin Dang 403d93d064 Fix capturedImageView layout 2018-02-12 14:35:55 -08:00
Kevin Dang ca68d65605 Fix capturedImageView layout 2018-02-12 14:26:39 -08:00
Kevin Dang 4c6ff1c90c Make the ORKImageCaptureCameraPreviewView take the full width of the screen rather than being dependent on templateImage size. 2018-02-12 12:14:40 -08:00
Nino Guba c463359725 Added support for Dynamic Types to ORKMultipleValuePicker 2018-02-10 14:02:58 -08:00
Nino Guba decab237e8 Added support for Dynamic Types to ORKHeightPicker and ORKWeightPicker 2018-02-10 13:52:10 -08:00
Nino Guba 6577436bd4 Added support for Dynamic Types to ORKValuePicker 2018-02-10 13:44:10 -08:00
srinathtm-apple 4132c20897 Merge pull request #1054 from rsanchezsaez/rss/reviewing-guidelines
[docs] Add first draft of the ResearchKit Reviewing Guidelines
2018-02-09 11:06:36 -08:00
Ricardo Sanchez-Saez d520f2963d [docs] Add first draft of the ResearchKit Reviewing Guidelines 2018-01-25 20:13:47 -08:00
kelseydedoshka-apple 6da912d08a Merge pull request #1041 from srinathtm-apple/master
[ResearchKit] fix for issue #1024
2018-01-11 14:40:06 -08:00
srinathtm-apple 4e61599b1f Merge pull request #1052 from akshay-yadav-apple/Fix-For-1019
[ResearchKit] fix for issue #1019
2018-01-11 14:39:22 -08:00
Akshay c8566b00bf [ResearchKit] fix for issue #1019 2018-01-10 10:32:18 -08:00
kelseydedoshka-apple e567a5071c Merge pull request #1025 from tobiasjungnickel/attributedInstructionStep
WIP: ORKInstructionStep detailText as NSAttributedString
2017-12-19 15:48:30 -08:00
Tobias Jungnickel 87fec7ce3a adding additional attributed detail text that overrides detail text if set 2017-12-19 21:25:41 +01:00
Tobias Jungnickel 51e4761e27 Merge branch 'master' into attributedInstructionStep 2017-12-19 19:02:07 +01:00
srinathtm-apple 774e638ca7 Merge pull request #1046 from akshay-yadav-apple/master
[ResearchKit] Fix for issue #1043
2017-12-18 10:22:51 -08:00
srinathtm-apple 79b2095fbd Merge pull request #856 from chrisortman/pdf-interface-1.4.1
Allow customization of rendered PDF
2017-12-15 14:39:17 -08:00
Chris Ortman 05d716c5a2 Remove .swift-version file 2017-12-15 16:10:36 -06:00
Akshay 3a1f004452 Removing duplicate code 2017-12-13 14:23:56 -08:00
Akshay f0db5c3a11 [ResearchKit] Fix for issue #1043 2017-12-13 12:38:23 -08:00
Srinath Tupil Muralidharan d513fbd6f3 [ResearchKit] fix for issue #1015 2017-12-06 15:34:42 -08:00
akshay-yadav-apple c2dfba9870 Merge pull request #1010 from ninoguba/weight_answer_format
Added ORKWeightAnswerFormat
2017-12-06 10:13:24 -08:00
Nino Guba 1dc28a703b Merge pull request #5 from rsanchezsaez/rss/weight-answer-format-merge-master-b
Merge master again
2017-12-06 07:16:46 -08:00
Ricardo Sanchez-Saez d43c1168e5 Merge branch 'master' of github.com:ResearchKit/ResearchKit into ninoguba/weight_answer_format
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
2017-12-06 01:01:30 -08:00
Srinath Tupil Muralidharan 1d2715afb4 [ResearchKit] fix for issue #1024 2017-12-05 17:30:05 -08:00
Pariece McKinney 33609c0fd8 Merge pull request #956 from Sage-Bionetworks/pr/split-ORKResult
Split ORKResult code files into separate files.
2017-12-04 14:03:17 -08:00
Shannon Young e2f178c0e9 Fix more issues that were accepted into master of buggy code.
Issues with ORKToneAudiometryResult and ORKWebViewStep discovered during unit testing of ORKTest.
2017-12-04 12:59:55 -08:00
Shannon Young 80720c1281 Fixes to classes introduces since last March that fail unit tests. 2017-12-04 12:36:46 -08:00
Shannon Young a118762015 Fix definition of the ORKQuestionStepViewController 2017-12-04 11:17:06 -08:00
Shannon Young 1a5d537030 Split out results for stroop and web view. 2017-12-04 10:53:01 -08:00
Nino Guba f1664e5901 Merge pull request #4 from rsanchezsaez/rss/weight-answer-format-merge-master
[Weight Answer Format] Merge master
2017-12-04 09:18:19 -08:00
Ricardo Sanchez-Saez 16dfd0e677 Merge branch 'master' of github.com:ResearchKit/ResearchKit into ninoguba/weight_answer_format
# Conflicts:
#	Testing/ORKTest/ORKTestTests/ORKESerialization.m
2017-12-03 22:31:08 -08:00
Shannon Young e10bb71e03 Merge branch 'master' into pr/split-ORKResult
# Conflicts:
#	ResearchKit/Common/ORKResult.h
#	ResearchKit/Common/ORKResult.m
2017-12-01 15:37:19 -08:00
kelseydedoshka-apple 580e8c9347 Merge pull request #1040 from Medable/issue992_htmlReviewContentNoSignature
Fixes #992. "Consent PDF with htmlReviewContent doesn't add signature page
2017-11-30 10:28:30 -08:00
Fer 51b4c2e539 Fixes #992. "Consent PDF with htmlReviewContent doesn't add signature page 2017-11-30 15:06:44 -03:00
kelseydedoshka-apple 715d5a7301 Merge pull request #1035 from CareEvolution/FormStepSkipFix
Fix for ORKFormStepViewController getting stuck in a "skipped" state
2017-11-29 09:00:38 -08:00
Mike Mertsock c8195bddbc ORKTest: Add shouldPresentStep validation example to exercise skip logic in form step 2017-11-28 18:05:20 -05:00
Mike Mertsock bd2319e74d Reset skipped state when user updates answers in form step 2017-11-28 18:04:00 -05:00
kelseydedoshka-apple ee443eadee Merge pull request #929 from tobiasjungnickel/tableStepSectionHeader
Extend ORKTableStepSource for custom section header
2017-11-26 15:41:44 -08:00
kelseydedoshka-apple 39056d50ab Merge pull request #965 from Medable/issue833_DateStep
Fixes #833. "Date Step - Mismatch between picker.date and what is shown in the UIDatePicker”.
2017-11-26 15:22:56 -08:00
kelseydedoshka-apple feebf2f932 Merge pull request #971 from benjamin-42/update-readme-swift-syntax
Update README.md Swift example code to latest Swift syntax
2017-11-22 13:16:14 -08:00
kelseydedoshka-apple f49b3015c1 Merge pull request #1032 from rsanchezsaez/rss/fix-additional-warnings
[Misc] Fix additional Xcode 9.1 warnings
2017-11-21 16:54:17 -08:00
kelseydedoshka-apple 470582b176 Merge pull request #1030 from CareEvolution/WebViewStep
Add "ORKWebViewStep"
2017-11-21 16:53:09 -08:00
chrisnowak 6c4075258b Add back to ORKTest 2017-11-21 16:44:58 -05:00
chrisnowak 4bf5df0a19 Merge flog 2017-11-21 16:40:02 -05:00
chrisnowak fbb39e1cc5 Fix merge flog 2017-11-21 16:37:54 -05:00
chrisnowak 6319d2861e Remove external url 2017-11-21 16:18:17 -05:00
chrisnowak 9c6c08380b Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into WebViewStep2 2017-11-21 16:11:54 -05:00
Nino Guba 25a71c950d Merge pull request #3 from rsanchezsaez/rss/weight-answer-format-fix-tests
[ORKWeightAnswerFormat] Fix unit tests
2017-11-21 09:21:33 -08:00
Ricardo Sanchez-Saez 271bbba44b [ORKWeightAnswerFormat] Fix serialization tests 2017-11-20 22:39:27 -08:00
Ricardo Sanchez-Saez 83d28ede08 [ORKWeightAnswerFormat] Fix typos 2017-11-20 22:36:08 -08:00
Ricardo Sanchez-Saez f10573e71b Merge branch 'master' of github.com:ResearchKit/ResearchKit into ninoguba/weight_answer_format 2017-11-20 21:32:00 -08:00
Ricardo Sanchez-Saez 06a58fab3a [Misc] Fix additional Xcode 9.1 warnings 2017-11-20 21:30:58 -08:00
kelseydedoshka-apple b9c5ed66bb Merge pull request #1031 from rsanchezsaez/rss/fix-unit-tests
[Misc] Fix unit tests
2017-11-17 11:35:59 -08:00
Shannon Young db51765a9b Merge branch 'master' into pr/split-ORKResult 2017-11-17 09:39:52 -08:00
srinathtm-apple 5a05aed6ee Merge pull request #1029 from rsanchezsaez/rss/Xcode-9.1
[Projects] Update projects to recommended Xcode 9.1 settings and fix all the warnings
2017-11-16 20:56:27 -08:00
Ricardo Sanchez-Saez d50a51c769 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/Xcode-9.1
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
2017-11-16 20:41:42 -08:00
Nino Guba d922ed87f5 Merge pull request #2 from rsanchezsaez/rss/weight_answer_format
[ORKWeightAnswerFormat] Merge master and resolve conflicts
2017-11-16 16:49:14 -08:00
Nino Guba 15cc58b874 Merge pull request #1 from rsanchezsaez/rss/weight_answer_format-no-merge
[ORKWeightAnswerFormat] Improvements
2017-11-16 12:48:58 -08:00
Ricardo Sanchez-Saez 18b730169f [ORKWeightAnswerFormat] Re-add ORKTest examples 2017-11-16 01:17:37 -08:00
Ricardo Sanchez-Saez 7a1d69a9d1 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/weight_answer_format
# Conflicts:
#	ResearchKit/Common/ORKTypes.h
#	ResearchKit/Common/ORKTypes.m
#	Testing/ORKTest/ORKTest/MainViewController.m
2017-11-16 01:10:40 -08:00
Ricardo Sanchez-Saez 2d6efeb430 [ORKCatalog] Capitalize displayed text for ORKWeightAnswerFormat examples 2017-11-16 00:50:22 -08:00
Ricardo Sanchez-Saez 9cbba81572 [ORKWeightPicker] Update localized measure string to ‘lb’ 2017-11-16 00:42:32 -08:00
Ricardo Sanchez-Saez 3108e24830 [ORKWeightPicker] Update ORKTest sample code placeholders 2017-11-16 00:40:39 -08:00
Ricardo Sanchez-Saez 2eefc77cbe [ORKWeightPicker] Rename fraction methods 2017-11-16 00:35:24 -08:00
Ricardo Sanchez-Saez e61c9463a5 [ORKWeightPicker] Add extra properties to NSSecureCoding and equality 2017-11-16 00:34:08 -08:00
Ricardo Sanchez-Saez c1567e8ae6 [ORKWeightPicker] Reuse more code in kg <-> lb converting options; increase conversion precision 2017-11-16 00:26:10 -08:00
Ricardo Sanchez-Saez af08beeb4c [ORKTests] Fix ORKImageChoice serialization tests 2017-11-16 00:03:25 -08:00
Ricardo Sanchez-Saez 86beb05399 [ORKNumericAnswerFormat] Rename ‘scale’ to ‘maximumFractionDigits’ and fix serialization tests 2017-11-15 23:47:52 -08:00
Ricardo Sanchez-Saez 7b8b4dd2ce [ORKRecorderTest] Decrease ork_doubleEqual() precision to pass location recorder tests on the simulator 2017-11-15 23:29:38 -08:00
Ricardo Sanchez-Saez b3dfb08f50 [ORKWeightAnswerFormat] Use ‘double’ instead of ’NSNumber’ for numeric parameters 2017-11-15 22:54:43 -08:00
Ricardo Sanchez-Saez b0bf985469 [ORKWeightAnswerFormat] Change order of parameters 2017-11-15 21:55:52 -08:00
akshay-yadav-apple 7e4967ca06 Merge pull request #959 from Sage-Bionetworks/pr/split-task-modules
Split out ORKOrderedTask task modules into a separate file.
2017-11-15 12:41:44 -08:00
kelseydedoshka-apple e8ed8d2c7e Merge pull request #953 from rsanchezsaez/rss/ORKTest-refactor-b
[ORKTest] Extract task-creating methods to new TaskFactory class
2017-11-15 10:10:51 -08:00
Ricardo Sanchez-Saez d55689dc5e [ORKWeightPicker] Replace ‘valueInterval’ and ‘additionalPrecision’ by ‘numericPrecision’ 2017-11-15 00:46:50 -08:00
Ricardo Sanchez-Saez e2a52c7188 [Height and Weight Pickers] Reuse code by leveraing answerFormat’s -stringForAnswer: method 2017-11-14 22:23:21 -08:00
Ricardo Sanchez-Saez c7ea76a983 [ORKWeightAnswerFormat] Simplify -stringForAnswer: method 2017-11-14 22:22:41 -08:00
Ricardo Sanchez-Saez 73aa1157e6 Revert "[Misc] Update my copyright"
This reverts commit cb94f06094.

# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
2017-11-14 14:40:44 -08:00
chrisnowak 0a40250aea Add to ORKTest 2017-11-14 09:46:42 -05:00
chrisnowak c3e7db8c0f Revert "Remove invalid ResearchKit.framework references"
This reverts commit eba62c4857.
2017-11-14 09:07:35 -05:00
Ricardo Sanchez-Saez a0ef5b1715 [Assets] Xcode 9.1 insists on reordering some xcassets fields 2017-11-14 01:17:36 -08:00
Ricardo Sanchez-Saez 6f45964342 [ORKTextChoice] Remove deprecated code 2017-11-14 00:50:52 -08:00
Ricardo Sanchez-Saez 31a86204a9 [Misc] Fix ORKTextChoice warnings 2017-11-14 00:42:10 -08:00
Ricardo Sanchez-Saez 2844102696 [ORKAnswerFormat] Fix convenience initializer being marked as designated 2017-11-14 00:30:17 -08:00
Ricardo Sanchez-Saez 82bb27199a [Misc] Fix strict-prototypes warnings 2017-11-14 00:29:58 -08:00
Ricardo Sanchez-Saez a3f9680006 [Projects] Update all projects to the recommended Xcode 9.1 settings 2017-11-14 00:27:10 -08:00
chrisnowak f851397de0 Set appropriate end time 2017-11-12 11:25:05 -05:00
chrisnowak e998d0747c Add loading indicator 2017-11-12 11:22:47 -05:00
chrisnowak 3682da0aab Check answer for type information 2017-11-12 11:10:46 -05:00
chrisnowak 973beb0fa8 Add embedded html in sample webviewstep 2017-11-12 11:03:52 -05:00
chrisnowak e8e1c36692 Allow embedding html instaed of a url 2017-11-12 10:19:06 -05:00
chrisnowak b7ddc6d195 Add to ORKCatalog 2017-11-11 10:17:02 -05:00
chrisnowak 24dca514a7 Add web view step result 2017-11-11 09:50:42 -05:00
chrisnowak 60ccc4bfad Adding base web view step 2017-11-11 09:33:55 -05:00
kelseydedoshka-apple 9efac8e6a2 Merge pull request #1026 from corduroy/cameraMicrophonePermissions
Add Info.plist keys for microphone and camera access
2017-11-09 14:39:56 -08:00
Joshua McKinnon 0695468020 Add Info.plist keys for microphone and camera access 2017-11-02 16:49:40 +11:00
Tobias Jungnickel b5e625b46f migrating detailText from NSString to NSAttributedString 2017-10-31 06:24:59 +01:00
Pariece McKinney 3e39509af2 Merge pull request #1016 from ninoguba/image_choice_vertical
Added vertical layout option and multiple choice to ORKImageChoiceAnswerFormat
2017-10-09 15:36:42 -07:00
Srinath Tupil Muralidharan ea00c5862e Merge branch 'docs_august17' into 'master'
Docs august17

See merge request !83
2017-10-03 13:12:06 -07:00
Srinath Tupil Muralidharan e6b3ad79f0 [Docs] removing all references to Utility and adding back Passcode 2017-09-26 17:04:15 -07:00
Nino Guba ef1c55cb8e Added valueInterval attribute and defaulted .5 intervals to metric weight values to match Medical ID weight picker 2017-09-20 21:06:46 -07:00
Pariece McKinney b3b484ab61 Merge pull request #1013 from ninoguba/bugfix_height_answer_format
Fix for #1012 to prevent inch value from decrementing unexpectedly
2017-09-20 13:42:26 -07:00
Nino Guba 51acba1999 Added support for multiple choice in ORKImageChoiceAnswerFormat 2017-09-18 23:07:30 -07:00
Nino Guba a984ace443 Added vertical layout option to ORKImageChoiceAnswerFormat 2017-09-18 20:35:00 -07:00
Nino Guba b0a915a30c Fix for #1012 to prevent inch value from decrementing unexpectedly 2017-09-16 10:57:22 -07:00
Nino Guba 5d9bb6c833 Corrected the HK units to match corresponding canonical unit for Weight and Height 2017-09-16 10:25:58 -07:00
Nino Guba 87e9e49519 Fixed HealthKit data handling for Weight and Height; Added example steps using HealthKit quantities for Weight and Height in ORKCatalog 2017-09-16 10:18:54 -07:00
Nino Guba d772f3885a Fixed weight value conversion discrepancies; Limit ounce picker values from 0 to 15 2017-09-15 21:56:33 -07:00
Nino Guba 6b7277cf72 Added minimum and maximum value validations 2017-09-14 21:44:23 -07:00
Nino Guba 45e7f6b529 Added checking min and max values 2017-09-14 20:26:03 -07:00
Nino Guba feae58cde6 Added support for initializing ORKWeightAnswerFormat with default/min/max values and additional precision 2017-09-14 20:02:02 -07:00
Nino Guba 9a635b7227 Added ORKWeightAnswerFormat 2017-09-05 14:50:24 -07:00
Shannon Young 292ad92204 Merge branch 'master' into pr/split-task-modules
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/Common/ORKOrderedTask.h
#	ResearchKit/Common/ORKOrderedTask.m
2017-09-05 10:20:23 -07:00
Shannon Young 2ba1e8a2fd Fix merge from master 2017-09-05 10:08:50 -07:00
Shannon Young 75d8e0d167 Merge branch 'master' into pr/split-ORKResult
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/Common/ORKResult.h
#	ResearchKit/Common/ORKResult.m
2017-09-05 10:08:37 -07:00
Joanna Brodbeck 8e2d6a1f34 Removed example of Video Step 2017-08-22 15:39:29 -07:00
Joanna Brodbeck 30f434f18f update screenshot 2017-08-07 16:29:46 -07:00
Joanna Brodbeck 4645015361 Active Tasks: Edits per SM. Overview and Creating Surveys: new content. 2017-08-07 12:13:10 -07:00
Joanna Brodbeck aa15382dc1 Added screenshots and text to Active Tasks. 2017-08-03 19:38:37 -07:00
Akshay 1e8f90f0c8 Merge branch 'Github_master' into Gitlab_master 2017-07-24 12:26:34 -07:00
Pariece McKinney 6886f9345c Merge pull request #987 from Science37/feature/ORKNumericAnswerFormat-decimal-scale
Added decimal scale limit to `ORKNumericAnswerFormat`
2017-07-23 13:12:27 -07:00
Akshay f561f2c51d Merge remote-tracking branch 'origin/stable'
merging stable
2017-07-19 10:58:21 -07:00
Pariece McKinney 7b40d16da2 Merge pull request #974 from hasiniran/master
Issue #973
2017-07-17 11:38:02 -07:00
Akshay 184b1938e5 Version Fixes 2017-07-13 11:51:31 -07:00
Akshay 44c88877c5 Fix for CocoaPods 2017-07-13 11:42:25 -07:00
Akshay 6f2ac3f671 Fixes 2017-07-13 11:19:33 -07:00
Akshay a2d2b13d58 COnvergence 2017-07-06 18:15:56 -07:00
Akshay 007583929c Convergence 2017-07-06 18:08:13 -07:00
Akshay e52e22e8f5 Convergence 2017-07-06 15:48:38 -07:00
Akshay c97d6bd78c Convergence 2017-07-06 15:33:24 -07:00
Kelly Chu 56c3d19cb1 Added decimal scale limit to ORKNumericAnswerFormat 2017-06-28 14:20:06 -07:00
Ricardo Sánchez-Sáez 724dd34bac [ORKTest] Re-add Stroop Task 2017-06-21 00:48:32 -07:00
Ricardo Sánchez-Sáez 7c6e83a0fc Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/ORKTest-refactor-b
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
#	Testing/ORKTest/ORKTest/Tasks/TaskFactory.swift
2017-06-21 00:43:31 -07:00
kelseydedoshka-apple 11228283fa Merge pull request #972 from benjamin-42/fix-passcode-view-controller-layout-glitch
[ORKPasscodeStepViewController] Make sure the view has been laid out before showing the keyboard
2017-06-20 11:03:18 -07:00
kelseydedoshka-apple fa0f23320b Merge pull request #966 from cheif/master
Fix class visibility for new types of Steps, fixes #649
2017-06-19 22:49:03 -07:00
Akshay 05be5f9ae7 Convergence 2017-06-07 10:49:07 -07:00
Akshay e6e4698306 Convergence 2017-06-07 10:10:19 -07:00
Umer Khan 2efdb9d56f Merge pull request #976 from netbe/fix/bundle-version
Update bundle version
2017-05-04 13:45:40 -07:00
François Benaiteau 6907cedf95 Update bundle version 2017-05-02 19:20:49 +08:00
Akshay 113b29ba56 Merge branch 'master' of https://github.com/ResearchKit/ResearchKit
* 'master' of https://github.com/ResearchKit/ResearchKit: (95 commits)
  [Deprecation] Restore deprecated methods which are removed in other PRs
  [ORKTest] Fix serialization tests
  [Deprecation] Re-add ORKTextAnswerFormat and ORKRegistrationStep regex methods
  [Project] Remove unneeded podspec file
  [ORKLocation] Revert wrong 'copy' to 'assign' ivar change
  [Misc] Fix Xcode 8.3 warnings and error
  Closes #922 redefinition of module error
  Fix Redefinition of module error in Xcode 8.3
  Fixed bug with ORKTextChoice not using the correct tint color
  Changed upper duration limit from 120 to 1200
  [ORKESerialization] Fix typo
  [ORKJSONSerializationTests] Simplify property initialization by generalizing usage of the orktest_init helper
  [ORKAnswerFormat] Indentation fixes
  [ORKESerialization] Fix ORKTextAnswerFormat tests
  [ORKTextAnswerFormat] Replace 'validationRegex' (the patterm) and 'validationRegexOptions' properties by 'validationRegularExpression' (an NSRegularExpression object)
  [ORKRegistrationStep] Clarify 'passcodeValidation' serialization comments
  [ORKTextAnswerFormat] Change 'validationRegexOptions' default value to 0
  [ORKTextAnswerFormat] Fix merge issue
  Fix localization for formatted strings so that they will localize correctly left-to-right.
  Fix documentation
  ...
2017-04-28 00:48:57 -07:00
Chris Ortman 221996b73a Removing bundler files 2017-04-26 22:15:19 -05:00
Chris Ortman c309d69349 Update copyright 2017-04-26 22:13:47 -05:00
hasiniran 4dffafc10d Issue #973
in ORKPasscodeStepViewController, supported interface orientation is
set to UIInterfaceOrientationMaskPortrait. To support any orientation
this was changed to UIInterfaceOrientationMaskAll.
2017-04-13 12:43:09 -04:00
Benjamin Randazzo b46ebf3ded [ORKPasscodeStepViewController] Make sure the view has been laid out before showing the keyboard
This is a fix for issue #960, -viewDidAppear: is called but the view isn't on screen yet when the view controller is set in a UIPageViewController
2017-04-08 21:17:26 +02:00
Benjamin Randazzo b9351232fc Update README.md Swift example code to latest Swift syntax 2017-04-08 17:54:34 +02:00
Umer Khan b04a5aa6a4 Merge pull request #969 from rsanchezsaez/rss/deprecation
[Deprecation] Re-add ORKTextAnswerFormat and ORKRegistrationStep regex methods
2017-04-07 15:41:03 -07:00
Ricardo Sanchez-Saez 76cec79983 [Deprecation] Restore deprecated methods which are removed in other PRs
This partially reverts commit c3d25d6edc.
2017-04-07 00:48:08 -07:00
Ricardo Sanchez-Saez 3697e01b6f [ORKTest] Fix serialization tests 2017-04-06 02:15:26 -07:00
Ricardo Sanchez-Saez c3d25d6edc [Deprecation] Re-add ORKTextAnswerFormat and ORKRegistrationStep regex methods
Also, move every deprecated method to the new ORKDeprecated.h/.m files. Add specific deprecation attributes and comments.
2017-04-06 02:02:47 -07:00
Ricardo Sanchez-Saez 261bc598f0 [Project] Remove unneeded podspec file 2017-04-06 01:16:22 -07:00
Scott Guelich eba62c4857 Remove invalid ResearchKit.framework references
Was showing up as duplicate entry under ResearchKit/Products
and causing embedding this framework in other targets to fail
2017-04-04 07:33:49 -07:00
Dan Berglund a4e49d490d Fix class visibility for new types of Steps, fixes #649 2017-04-03 17:04:20 -04:00
Ricardo Sanchez-Saez 6bde09345f [ORKTest] Homogenize step and item identifiers 2017-04-02 23:13:11 -07:00
Ricardo Sanchez-Saez a81c577fc3 [ORKTest] Convert iterruptible example to block based interface 2017-04-01 01:13:02 -07:00
Shannon Young 2058936108 Fix equality for ORKLocation 2017-03-31 17:00:16 -07:00
Shannon Young 5be15107b3 Merge branch 'master' into pr/split-ORKResult
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/Common/ORKResult.h
#	ResearchKit/Common/ORKResult.m
#	ResearchKit/Common/ORKResult_Private.h
2017-03-31 12:41:29 -07:00
Shannon Young fb6dd4782a Fix issues with ORKLocation merge from master 2017-03-31 11:23:34 -07:00
Shannon Young 4a944cc972 Merge branch 'master' into pr/split-task-modules 2017-03-31 10:51:07 -07:00
Fernando Waigandt 022144ad28 Fixes #833. "Date Step - Mismatch between picker.date and what is shown in the UIDatePicker”. 2017-03-31 10:59:54 -03:00
Ricardo Sanchez-Saez 238cae5d31 [ORKTest] Consolidate the rest of examples that use 'stepViewControllerWillAppear:' 2017-03-30 21:52:52 -07:00
Ricardo Sanchez-Saez 0870abc22b [ORKTest] Consolidate stepViewControllerWillAppear: examples in new "Step Will Appear" test
Also, reimplement 'stepViewControllerWillDisappear:' example using the block based approach; and delete a few no longer needed task helper properties.
2017-03-30 21:22:02 -07:00
Ricardo Sanchez-Saez 3b74dd93f6 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/ORKTest-refactor-b 2017-03-30 20:19:54 -07:00
Umer Khan d82eae5f94 Merge pull request #964 from rsanchezsaez/rss/xcode-8.3-warnings
[Misc] Fix Xcode 8.3 warnings and error
2017-03-30 14:33:51 -07:00
Umer Khan 14b27ada27 Merge pull request #963 from stevemoser/patch-5
Fix Redefinition of module error in Xcode 8.3
2017-03-30 14:33:01 -07:00
Ricardo Sanchez-Saez 56a261eb27 [ORKLocation] Revert wrong 'copy' to 'assign' ivar change 2017-03-30 10:48:51 -07:00
Tobias Jungnickel 988371fb28 Merge pull request #1 from syoung-smallwisdom/syoung-pr/tableStepSectionHeader
Fix the loop for the case where the UITableViewDelegate and this protocol clash
2017-03-30 19:25:03 +02:00
Ricardo Sanchez-Saez 0a377eda53 [ORKTest] Begin removal of taskViewController:stepViewControllerWillAppear: test code
Use a block associated to the relevant ORKStep instead.
2017-03-29 22:35:42 -07:00
Ricardo Sanchez-Saez 1fc013742a [ORKTest] Get rid of task identifier constants
It now uses the automatically generated task identifiers. This also adds a NSObject (TaskFactory) helper category for commicating task intent to the MainViewController.
2017-03-29 21:12:26 -07:00
Ricardo Sanchez-Saez 2a196bc768 [ORKTest] Update copyright headers for new files 2017-03-28 20:13:12 -07:00
Ricardo Sanchez-Saez 6bb2313a1f [TaskFactory+Forms] Resolve merge conflict 2017-03-28 20:07:55 -07:00
Ricardo Sanchez-Saez dcd0be1132 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/ORKTest-refactor-b
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
2017-03-28 20:03:19 -07:00
Ricardo Sanchez-Saez 8ba80ac79d [Misc] Fix Xcode 8.3 warnings and error
Starting on Xcode 8.3, the 'module.modulemap' file caused the compilation error described in https://github.com/ResearchKit/ResearchKit/issues/922. Renaming it to 'ResearchKit.modulemap' seems to fix the issue.
2017-03-28 19:48:28 -07:00
Steve Moser ceca4baf42 Closes #922 redefinition of module error 2017-03-28 20:53:47 -04:00
Steve Moser e83c26208b Fix Redefinition of module error in Xcode 8.3 2017-03-28 20:50:02 -04:00
Umer Khan 30fd3c0cc6 Merge pull request #958 from ninoguba/textchoice_tintcolor_fix
Fixed bug with ORKTextChoice not using the correct tint color
2017-03-28 11:54:11 -07:00
Umer Khan 22f6aeb066 Merge pull request #952 from rsanchezsaez/rss/nsregularexpression-options
[ORKTextAnswerFormat] Replace the validation regex pattern by a NSRegularExpression object
2017-03-28 11:45:32 -07:00
Ricardo Sanchez-Saez 343be912d0 [ORKtest] Reorganize TaskFactory into categories
Also, reorganize some project files.
2017-03-28 01:23:30 -07:00
Ricardo Sanchez-Saez 0972a789a4 [ORKTest] Remove unneeded import 2017-03-27 22:13:22 -07:00
Ricardo Sanchez-Saez fe994cea75 [TaskFactory] Add missing 'introStep' on the Navigable Ordered Task 2017-03-23 21:47:13 -07:00
Ricardo Sanchez-Saez 7fe617e765 [ORKTest] Dynamically calculate the task identifier
This allows removing a bunch of boilerplattery '-itemTitleButtonTapped:' methods.

Also, reorder and rename task identifiers in the TaskFactory to support this.
2017-03-23 21:47:13 -07:00
Ricardo Sanchez-Saez d451b26788 [ORKTest] Remove 'Task' from all item names 2017-03-23 21:47:13 -07:00
Ricardo Sanchez-Saez 6632633322 [ORKTest] Replace coupled section arrays by array of dictionaries
This is easier to maintain.

Also:
- Set 'adjustsFontSizeToFitWidth' to YES for button labels.
- Improve Image Choice Task name and text.
2017-03-23 21:47:13 -07:00
Ricardo Sanchez-Saez 2841a8f348 [ORKTest] Reorganize main sections
Includes:
- Create a few new sections.
- Alphabetically order sections (except 'Miscellaneous' which is kept last).
- Alphabetically order items within each section.
- Rename some items for consistency.
2017-03-23 21:47:13 -07:00
Ricardo Sanchez-Saez a0e1317c22 [TaskFactory] Add missing CompletionStepTask to task switch 2017-03-23 21:46:56 -07:00
Shannon Young bfe3e691e1 Split the predefined Active Task modules into a separate file. 2017-03-22 11:42:00 -07:00
Shannon Young 392ee67733 Move temp file back to original file name. 2017-03-22 10:43:00 -07:00
Shannon Young a3b9ec6d3d Merge branch 'task/splitA' into pr/split-task-modules
# Conflicts:
#	ResearchKit/Common/ORKOrderedTask+TaskModules.h
#	ResearchKit/Common/ORKOrderedTask+TaskModules.m
#	ResearchKit/Common/ORKOrderedTask.h
#	ResearchKit/Common/ORKOrderedTask.m
#	ResearchKit/Common/ORKOrderedTask_temp.h
#	ResearchKit/Common/ORKOrderedTask_temp.m
2017-03-22 10:41:23 -07:00
Shannon Young 109f69b9df temp split of ORKOrderedTask 2017-03-22 10:23:14 -07:00
Shannon Young 79d61223c6 Split out ORKOrderedTask task modules into a separate file. 2017-03-22 10:20:55 -07:00
Shannon Young f97b4923b6 Fix nullable for ORKLocation 2017-03-21 23:46:12 -07:00
Nino Guba e391fbf254 Fixed bug with ORKTextChoice not using the correct tint color 2017-03-21 15:40:56 -07:00
Shannon Young 8de0d5c755 Split ORKPasscodeResult into a separate file. 2017-03-21 14:38:09 -07:00
Shannon Young e030fff263 Split ORKSignatureResult and ORKConsentSignatureResult into separate file. 2017-03-21 14:32:53 -07:00
Shannon Young f4753aacf1 Split ORKVideoInstructionStepResult into a separate file. 2017-03-21 14:17:50 -07:00
Shannon Young 2075cf8fb1 Split ORKQuestionResult subclasses into a separate file. 2017-03-21 14:00:34 -07:00
Shannon Young e9e165e10d Remove unused private ORKDataResult subclass. 2017-03-21 13:34:50 -07:00
Shannon Young 121507db1c Split ORKCollectionResult subclasses into separate file. 2017-03-21 13:33:04 -07:00
Shannon Young 139ad4f8b6 Split ORKResult into separate files for each active task result.
`ORKResult` is getting huge, difficult to maintain, and difficult to handle merge conflicts. I’ve separated out all the active task results into a file for each module result type. Additionally, I split out the `ORKQuestionResult` subclasses into a separate file and the `ORKCollectionResult` subclasses into a separate file.
2017-03-21 13:03:14 -07:00
Umer Khan 96712fcfcd Merge pull request #954 from rochoSC/bug-fix-917
Fix for issue #917
2017-03-21 11:30:04 -07:00
Roger Solis bac6fff8f1 Changed upper duration limit from 120 to 1200 2017-03-21 11:45:14 -05:00
Ricardo Sanchez-Saez cb94f06094 [Misc] Update my copyright 2017-03-20 22:18:51 -07:00
Ricardo Sanchez-Saez 377120ac38 [TaskFactory] Update copyright 2017-03-20 22:17:34 -07:00
Ricardo Sanchez-Saez 161e56c738 [ORKESerialization] Fix typo 2017-03-20 11:54:16 -07:00
Umer Khan ce50dbccea Merge pull request #951 from Sage-Bionetworks/pr/fix-localization-strings
Fix localization for formatted strings so that they will localize correctly left-to-right.
2017-03-20 11:04:15 -07:00
Ricardo Sanchez-Saez 4ff30c68fe [ORKTest] Extract task-creating methods to new TaskFactory class 2017-03-19 19:30:08 -07:00
Ricardo Sanchez-Saez 8e3aaa4246 [ORKJSONSerializationTests] Simplify property initialization by generalizing usage of the orktest_init helper 2017-03-19 18:30:21 -07:00
Ricardo Sanchez-Saez 4f087ce783 [ORKAnswerFormat] Indentation fixes 2017-03-19 18:05:13 -07:00
Ricardo Sanchez-Saez f03084534d [ORKESerialization] Fix ORKTextAnswerFormat tests
Adds NSRegularExpression serialization/deserialization. Note that the tests are ignoring the 'validationRegularExpression' for the hash test becuase it's purposefully not included there.

Also, slight fix to the CLCircularRegion serialization (a nil CLCircularRegion must be serialized into an empty dict, not into a nil object). Otherwise it'll crash if you try to add nil to the parent serialization dictionary.
2017-03-19 17:56:30 -07:00
Ricardo Sanchez-Saez 4da2747943 [ORKTextAnswerFormat] Replace 'validationRegex' (the patterm) and 'validationRegexOptions' properties by 'validationRegularExpression' (an NSRegularExpression object) 2017-03-19 17:53:40 -07:00
Ricardo Sanchez-Saez 10bb15f253 [ORKRegistrationStep] Clarify 'passcodeValidation' serialization comments 2017-03-19 15:35:48 -07:00
Ricardo Sanchez-Saez 15601c420a [ORKTextAnswerFormat] Change 'validationRegexOptions' default value to 0
And update documentation accordingly.
2017-03-19 15:34:45 -07:00
Ricardo Sanchez-Saez 8d8b2e3db6 [ORKTextAnswerFormat] Fix merge issue 2017-03-19 15:17:27 -07:00
Ricardo Sanchez-Saez 945d5e9f25 Merge branch 'master' of github.com:ResearchKit/ResearchKit into nsregularexpression-options
# Conflicts:
#	ResearchKit/Common/ORKAnswerFormat.m
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
2017-03-19 15:15:17 -07:00
Shannon Young b87babb66c Fix localization for formatted strings so that they will localize correctly left-to-right.
When using string formatting, Apple’s recommendation is to use `localizedStringWithFormat:` for cases where the string may be displayed in a language that reads from left-to-right.
2017-03-16 10:56:10 -07:00
Chris Ortman c5d864dbb4 Updating license & copyright 2017-03-16 10:36:27 -05:00
Chris Ortman 9e9ba10a52 Add swift-version file for pod lint
pod lib lint --allow-warnings now passes
2017-03-16 09:50:03 -05:00
Chris Ortman 06fe8e8ce9 Add bundler to ensure consistent version of cocoapods 2017-03-16 09:50:03 -05:00
Chris Ortman 692d7b50a4 Allow the renderer to declare it's own width & height 2017-03-16 09:50:03 -05:00
Chris Ortman 55dd93238e Modify ORKConsentDocument to allow passing a renderer 2017-03-16 09:50:03 -05:00
Umer Khan 69e642792d Merge pull request #896 from Sage-Bionetworks/pr/add-multicomponent-picker-format
Add answer format for handling a multiple component picker.
2017-03-15 10:30:09 -07:00
Shannon Young 4c0afc0037 Merge branch 'master' into pr/add-multicomponent-picker-format
# Conflicts:
#	ResearchKit/Common/ORKAnswerFormat.h
#	ResearchKit/Common/ORKAnswerFormat.m
2017-03-15 10:27:20 -07:00
Umer Khan a8777b84b5 Merge pull request #947 from stevemoser/patch-4
Add NSHealthShareUsageDescription key
2017-03-15 10:16:06 -07:00
Umer Khan 5c4d36c398 Merge pull request #934 from Sage-Bionetworks/pr/fix-passcodeFlow-equality-coding-copying
Fix missing passcodeFlow serialization, copying, encoding and equality
2017-03-15 10:13:04 -07:00
Umer Khan c25a9954b2 Merge pull request #941 from MacroYau/feature/custom-boolean-answer
Add custom yes and no strings option for ORKBooleanAnswerFormat
2017-03-15 10:09:54 -07:00
Macro Yau a7bb837e4b Fix documentation 2017-03-15 12:05:42 +08:00
Macro Yau ca99dcbc2d Add example to ORKTest's Selection Survey 2017-03-15 11:53:52 +08:00
Macro Yau 9f06cc0575 Implement factory method in ORKAnswerFormat 2017-03-15 11:52:14 +08:00
Macro Yau 2dba4fd450 Add documentation 2017-03-15 11:30:27 +08:00
Macro Yau 47fc7c8475 Override hash() in ORKBooleanAnswerFormat 2017-03-15 11:18:31 +08:00
Macro Yau f7c9ad2692 Fix copyWithZone() implementation 2017-03-15 11:16:55 +08:00
Steve Moser a600a87480 Add NSHealthShareUsageDescription key
This prevents a crash during the fitness task.
2017-03-14 21:07:47 -04:00
Shannon Young 1cd821b2da Fix encoding to use ENUM instead. 2017-03-14 16:46:11 -07:00
Umer Khan 563a081168 Merge pull request #938 from MacroYau/feature/charts-decimal-place
Allow custom decimal places in ORKGraphChartView
2017-03-14 15:36:19 -07:00
Shannon Young b3f7f0ad90 Fixed code review issues with formatting 2017-03-14 14:12:35 -07:00
Umer Khan d3dd1934c6 Merge pull request #901 from Sage-Bionetworks/pr/open-navigation-rule
Allow interhitance of navigation rules outside ResearchKit
2017-03-14 13:53:22 -07:00
Shannon Young a133f6a3a0 Merge branch 'master' into pr/add-multicomponent-picker-format 2017-03-14 13:50:20 -07:00
Umer Khan 442968c622 Merge pull request #944 from stevemoser/fix-app-delegate-for-swift-3
Fix app delegate for swift 3
2017-03-14 13:23:02 -07:00
Umer Khan 4f6af4ed83 Merge pull request #865 from Sage-Bionetworks/pr/update-healthkit-answerformat
Add missing HealthKit characteristic types to answer format.
2017-03-14 13:21:59 -07:00
Umer Khan 47191bfdbc Merge pull request #915 from joshbruhin/Bridge-1684
Call becomeFirstResponder with dispatch to main queue after delay
2017-03-14 13:00:31 -07:00
Umer Khan 0f5dca38e4 Merge pull request #880 from faraz-hussain/pr/add-module-trailmaking-test
Add module for trail making test
2017-03-14 12:22:53 -07:00
Umer Khan 161001357d Merge pull request #902 from Sage-Bionetworks/pr/add-result-to-stepViewController
Add method to ORKStepViewController to allow adding a result
2017-03-14 12:04:13 -07:00
Umer Khan 2de86b189e Merge pull request #840 from Sage-Bionetworks/pr/ui-step-footnote
Add footnote label displayed at the bottom of an instruction or form step.
2017-03-14 11:55:57 -07:00
Umer Khan f739fed350 Merge pull request #804 from Sage-Bionetworks/pr/add-memory-copyright
There is a copyright that should be included with the memory game.
2017-03-14 11:54:10 -07:00
Umer Khan 3a6fc380cf Merge pull request #910 from Sage-Bionetworks/pr/add-primitive-number-to-equality-test
Added equality testing for primitive double, int and bool properties
2017-03-14 11:50:08 -07:00
Umer Khan 2208a8bcfd Merge pull request #940 from johnsaigle/readmeUpdate
Update README to reflect new ORK syntax
2017-03-14 10:30:30 -07:00
Steve Moser 76b6b1e995 Fix app delegate methods not being called
Because of the changes to Swift 3 the sample app’s delegate methods
were not being called which made the apps fail in ways that aren’t
apparent at first launch.
2017-03-12 13:51:50 -04:00
Steve Moser 56243d7cd6 Merge branch 'ResearchKit/master' 2017-03-12 13:42:58 -04:00
Macro Yau 28c5e75375 Fix serialization and add tests 2017-03-11 16:06:59 +08:00
Macro Yau df4be2f4c4 Add NSCoder support 2017-03-11 15:22:17 +08:00
Macro Yau 9a778eafcd Add example to ORKCatalog 2017-03-11 11:55:37 +08:00
Macro Yau 4c8a05251c Add custom yes and no strings option for ORKBooleanAnswerFormat 2017-03-11 11:42:52 +08:00
John Saigle c0851d8f2e Update README to reflect new ORK syntax 2017-03-09 13:52:01 -05:00
Macro Yau 5c69459f6b Add customizable decimal place option for ORKYAxisView value labels 2017-03-09 16:16:29 +08:00
Macro Yau 66adcfd387 Add customizable decimal place option for ORKGraphChartView scrubber label 2017-03-09 16:08:21 +08:00
Shannon Young 1a6f84b706 Fix the loop for the case where the UITableViewDelegate and this protocol clash
It you point the `ORKTableStepSource` at the view controller then this will result in an infinite loop of wacky madness. Change the protocol to match the other methods in the protocol that provide a pointer to the table view as the last parameter.
2017-03-07 22:04:47 -08:00
Shannon Young 82dc103bbf Fixes in response to code review. 2017-03-07 15:17:16 -08:00
Shannon Young c17e90d775 fix code review issue. 2017-03-07 14:26:13 -08:00
Shannon Young d649b4a14d Fixed code review issues 2017-03-07 14:23:56 -08:00
Shannon Young 7a6dd5c580 Fix code review issues. 2017-03-07 13:50:38 -08:00
Shannon Young 65537987df use self.footnote.hash 2017-03-07 13:23:50 -08:00
Shannon Young 1ae3f86279 Fix missing passcodeFlow serialization, copying, encoding and equality 2017-03-07 11:41:05 -08:00
Umer Khan e4d2187871 Merge pull request #877 from sroymdsol/Expose_passcode_flow_types
Expose passcode flow types
2017-03-06 11:25:35 -08:00
Shannon Young 9499035725 Update to check programmatically for iOS 10 or watchOS 3 availability 2017-03-03 13:37:11 -08:00
Shannon Young 3680d05f38 Fix HKCharacteristicTypeIdentifierWheelchairUse iOS10 issue 2017-03-03 12:33:42 -08:00
Shannon Young 42a2d0efb8 Check for iOS10 for HKCharacteristicTypeIdentifierWheelchairUse 2017-03-03 11:07:51 -08:00
Shannon Young 0a8165ca35 Fix tests for ORKVideoCaptureStep 2017-03-03 00:54:22 -08:00
Shannon Young 325142bec2 Merge branch 'master' into pr/add-primitive-number-to-equality-test 2017-03-03 00:39:57 -08:00
Shannon Young 9b137318e0 Add space between imports and @implementation 2017-03-01 14:11:01 -08:00
Shannon Young 2330a21426 Cleanup in response to code review. 2017-03-01 14:07:07 -08:00
Shannon Young a09b5f3a70 For direct inheritance from ORKStepViewController, use parent results rather than added results. 2017-03-01 10:00:50 -08:00
Shannon Young e57e99b290 Merge remote-tracking branch 'origin/master' into pr/add-result-to-stepViewController 2017-03-01 09:29:59 -08:00
Shannon Young 64780981f2 Merge branch 'master' into pr/add-multicomponent-picker-format
# Conflicts:
#	ResearchKit/Common/ORKAnswerFormat.m
2017-02-28 15:44:37 -08:00
Tobias Jungnickel 787844d2a0 extend ORKTableStepSource to return custom title and view for header in section 2017-02-28 11:17:19 +01:00
Umer Khan ac74dfc416 Merge pull request #899 from Medable/issue834_ContinuousScaleStep
Fixes #834. "Continuous Scale Step - UI value and result value mismatch when using fraction digits."
2017-02-27 13:12:29 -08:00
Umer Khan 8f9f2f6de5 Merge pull request #908 from joshbruhin/BridgeTask-1513
Adding specific images for Tremor test left and right hand
2017-02-27 13:11:10 -08:00
Akshay 56d45c3a96 Merging latest public master 2017-02-23 14:58:10 -08:00
Shannon Young f45a6f629f Merge branch 'master' into pr/update-healthkit-answerformat 2017-02-17 09:35:45 -08:00
Josh Bruhin 0d11c9f9fd Bridge-1684 call becomeFirstResponder with dispatch to main queue after delay to prevent invisible keyboard when user hits ‘cancel’ in touch ID context 2017-02-09 15:17:49 -07:00
Umer Khan 2843759bcc Merge pull request #913 from stevemoser/patch-3
Add missing height question
2017-02-09 10:15:58 -08:00
Steve Moser a6509da0b1 Add missing height question 2017-02-07 15:51:48 -05:00
Shannon Young fc8c18ec0a Move healthkit read permissions to ORKStep
# Conflicts:
#	ResearchKit/Common/ORKOrderedTask.m
2017-02-03 11:21:32 -08:00
Kelsey Dedoshka badfbf0ad1 [Update] ResearchKit (1.4.1) 2017-02-01 15:10:08 -08:00
Faraz Hussain 3a630b3959 Adding timer label and error scores to trail making test 2017-01-31 13:30:04 -06:00
Shannon Young a2a6fef6aa Added test for checking the hash to equality tests. 2017-01-30 14:04:39 -08:00
Shannon Young 2986d85f58 Added equality testing for primitive double, int and bool properties
This adds equality checking for primitive types for the double, int and bool properties.

Note: this *only* checks equality and does not test these properties for encoding, though I have also fixed the encoding for those classes that failed the equality tests.
2017-01-30 13:10:16 -08:00
Josh Bruhin 5ee602bbee Deleting previous Tremortest2 image, replaced by TremortestLeft and TremortestRight 2017-01-30 12:22:33 -07:00
Josh Bruhin ee317862bb Adding specific images for Tremor test left and right hand instead of simply flipping the right-handed image for use as the left. 2017-01-30 12:17:29 -07:00
Umer Khan 182cb27551 Merge pull request #904 from stevemoser/patch-2
Fix ORKTimedWalkResult isEqual: and copyWithZone:
2017-01-30 08:54:35 -08:00
Umer Khan e54f09d973 Merge pull request #903 from stevemoser/patch-1
Fix fashion typo
2017-01-30 08:52:35 -08:00
Steve Moser dd7eb78775 Fix ORKTimedWalkResult isEqual: and copyWithZone:
It appears this was most likely the result of a copy and paste error. IMHO tests should be created for this class to catch small bugs like this one.
2017-01-28 15:33:22 -05:00
Steve Moser eae5eb5458 Fix fashion typo 2017-01-28 14:59:08 -05:00
Shannon Young a70323b73a Add method to ORKStepViewController to allow adding a result
Add a result to the step view controller's `ORKStepResult`. By default, the property for the step view controller's result will instantiate a copy of the result each time it is called. Therefore, the result cannot be mutated by adding a result to it's result array.

This method can be called by a delegate to add a result to a given step in a way that will be retained by the step, but will allow both the step and the ORKResult to be immutable when passed to the task view controller.

We have been finding that many of the researchers and developers we work with assume that this is possible and then become frustrated and confused when it doesn’t work.
2017-01-27 16:05:55 -08:00
Shannon Young d36b53336b Fixed warnings about int cast. 2017-01-26 16:23:37 -08:00
Faraz Hussain 0a2c937ef2 Redrawing graphics in UIView
Lines connecting dots are now redrawn if orientation is changed from
portrait to landscape or vice versa to maintain line coherence
2017-01-26 16:01:23 -06:00
Shannon Young 3d5dfec624 Allow interhitance of navigation rules outside ResearchKit
This will still throw an exception if the developer attempts to initialize an instance of the base class without inheriting it but allows developers to create navigation rules that inherit directly from the base class.
2017-01-26 11:40:59 -08:00
Fernando Waigandt e9569123fd Pull request #899 - Requested changes - Added Medable Copyright. 2017-01-25 21:35:38 -03:00
Fernando Waigandt d5ac624b24 Pull request #899 - Requested changes. 2017-01-25 21:28:43 -03:00
Faraz Hussain 5aade34809 Clarified instruction wording for trail making test 2017-01-25 15:06:30 -06:00
Faraz Hussain d7b44f890e Merge branch 'master' into pr/add-module-trailmaking-test 2017-01-25 15:00:30 -06:00
Shannon Young 250a18ee26 Merge branch 'master' into pr/ui-step-footnote
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
2017-01-25 10:54:55 -08:00
Umer Khan 1446df4559 Merge pull request #898 from rsanchezsaez/rss/ORKSignatureView-top
[ORKSignatureStepViewController] Fix not being able to start traces on the top part of the signature view
2017-01-25 10:45:32 -08:00
Umer Khan 1afe85b259 Merge pull request #769 from oliverschaefer/videoInstructionStep
Video Instruction Step
2017-01-25 10:43:52 -08:00
Steve Roy a93e0c15b8 Moved the passcodeFlow property and associated enums to be a property of ORKPasscodeStep instead of the view controller. 2017-01-25 11:01:51 -05:00
Fernando Waigandt d0c261b36b Medable - Fixes #834. "Continuous Scale Step - UI value and result value mismatch when using fraction digits." 2017-01-25 12:06:57 -03:00
Oliver Schäfer b1bc2e649d Merge pull request #7 from MacroYau/feature/videoinstructionstep
Implement requested changes in Video Instruction Step
2017-01-25 08:38:56 +01:00
Macro Yau 61eb619e3d Update ORKESerializer 2017-01-25 14:10:01 +08:00
Ricardo Sanchez-Saez 807d24b76e [ORKSignatureStepViewController] Rename 'ORKConsentSignatureWrapperView' to 'ORKSignatureWrapperView'
This makes all signature UI classes coherent. The result and data model classes still have the `ORKConsentSignature...` prefix (to differentiate from an automatically calculated electronic signature).
2017-01-24 20:57:19 -08:00
Ricardo Sanchez-Saez 80d707b094 [ORKSignatureView] Remove needless '_' prefix from method names 2017-01-24 20:48:35 -08:00
Ricardo Sanchez-Saez 601692b991 [ORKSignatureStepViewController] Fix not being able to start traces on the top part of the signature view 2017-01-24 20:46:27 -08:00
Macro Yau 4b143997b8 Implement requested changes 2017-01-25 11:02:42 +08:00
Macro Yau 6438c4770a Resolve merge conflicts 2017-01-25 10:56:39 +08:00
Shannon Young ab20d025e3 Merge branch 'master' into pr/add-multicomponent-picker-format
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
2017-01-24 14:16:20 -08:00
Shannon Young e8660e83ad Merge branch 'master' into pr/update-healthkit-answerformat
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
2017-01-24 14:13:33 -08:00
Shannon Young ddc90812d1 Merge branch 'master' into pr/ui-step-footnote
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	Testing/ORKTest/ORKTest/MainViewController.m
2017-01-24 14:06:01 -08:00
Umer Khan c024cbd503 Merge pull request #758 from Sage-Bionetworks/pr/ui-add-ORKPageStepViewController
Add ORKPageStep and ORKPageStepViewController
2017-01-24 13:49:10 -08:00
Umer Khan 0c9fb3b357 Merge pull request #848 from Sage-Bionetworks/pr/fix-tremor-navigation
Add ORKStepModifier to navigable task.
2017-01-24 13:23:35 -08:00
Umer Khan 7212f3c663 Merge pull request #845 from Sage-Bionetworks/pr/tablestep-source
ORKTableStepViewController improvements
2017-01-24 13:19:46 -08:00
Umer Khan 9a68704218 Merge pull request #894 from rsanchezsaez/rss/ORKSignatureView
[ORKSignatureView] Increase height and distance of signing line to bottom
2017-01-24 13:19:14 -08:00
Umer Khan b85949bf7b Merge pull request #897 from Sage-Bionetworks/pr/fix-regex-validation
Fix ORKTextAnswerFormat regex to be case sensitive.
2017-01-24 13:17:57 -08:00
Faraz Hussain a9d1ef573d Minor formatting changes requested during merge 2017-01-24 14:48:33 -06:00
Shannon Young dc185c69e4 Fix merge conflicts 2017-01-24 12:43:33 -08:00
Shannon Young 32abf1f6f5 Merge branch 'master' into pr/ui-add-ORKPageStepViewController
# Conflicts:
#	ResearchKit/Common/ORKResult_Private.h
#	ResearchKit/ResearchKit.h
#	ResearchKit/ResearchKit_Private.h
#	Testing/ORKTest/ORKTest/MainViewController.m
2017-01-24 12:17:18 -08:00
faraz-hussain 742b6f01ab Merge branch 'master' into pr/add-module-trailmaking-test 2017-01-24 14:13:54 -06:00
Shannon Young 2af14cfa68 Cleanup code style. 2017-01-24 12:03:39 -08:00
Umer Khan 2a3ffd2b18 Merge pull request #890 from rsanchezsaez/rss/ib-designable
[Charts] IBDesignable improvements
2017-01-24 11:56:11 -08:00
Shannon Young 2f72c15451 Cleaned up code style. 2017-01-24 11:55:52 -08:00
Shannon Young 74a8a0ec6d Merge branch 'master' into pr/tablestep-source 2017-01-24 11:52:00 -08:00
Shannon Young 06ce98338a Merge branch 'master' into pr/ui-step-footnote
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
2017-01-24 11:51:02 -08:00
Umer Khan 541ae005b6 Merge pull request #807 from slichlyter12/master
Added gesture recognizer to MapView for ORKLocationAnswerFormat
2017-01-24 11:47:19 -08:00
Umer Khan 090877e5d9 Merge pull request #859 from rsanchezsaez/umbrella-headers
[Umbrella headers] Update #imports to framework format
2017-01-24 11:45:27 -08:00
Shannon Young 3b41a38158 Fix warnings about the designated initializer 2017-01-24 11:42:05 -08:00
Umer Khan f57ec43e1f Merge pull request #837 from Sage-Bionetworks/pr/ui-completion-step-done-button
Add a flag to allow displaying the continue button in the standard position for the compltion step.
2017-01-24 11:32:58 -08:00
Umer Khan e17fb8008d Merge pull request #828 from Sage-Bionetworks/pr/fix-navigation-result-loop
Fix navigation looping to return unique results for each step.
2017-01-24 11:31:49 -08:00
Oliver Schäfer e818d99489 Merge pull request #6 from MacroYau/feature/videoinstructionstep
Resolve merge conflicts
2017-01-24 09:33:21 +01:00
Macro Yau 2fe68f6ac0 Fix ORKCatalog example 2017-01-24 14:00:20 +08:00
Macro Yau ec839b490c Resolve merge conflicts 2017-01-24 13:54:07 +08:00
Macro Yau a2ae36e08c Resolve merge conflicts 2017-01-24 13:18:21 +08:00
Ricardo Sanchez-Saez e9e6e781ae Merge branch 'master' of github.com:ResearchKit/ResearchKit into umbrella-headers 2017-01-23 19:27:40 -08:00
Ricardo Sanchez-Saez b97d728f7a Merge branch 'master' of github.com:rsanchezsaez/ResearchKit into umbrella-headers
# Conflicts:
#	ResearchKit/ResearchKit.h
#	ResearchKit/ResearchKit_Private.h
2017-01-23 19:27:26 -08:00
Ricardo Sanchez-Saez b2ec0051ba [ORKSignatureView] Better fit on iPhone 4 sizes 2017-01-23 19:20:49 -08:00
Shannon Young 2769f3f880 Show a separator between components. 2017-01-23 15:54:59 -08:00
Shannon Young 99195db143 Fix ORKTextAnswerFormat regex to be case sensitive. 2017-01-23 14:39:51 -08:00
Umer Khan 44ba432e8a Merge pull request #854 from Sage-Bionetworks/pr/optional-previous-result-override
Allow optional check of default result source before using previous.
2017-01-23 11:50:13 -08:00
Umer Khan 33673f320a Merge pull request #814 from celteeka/bug/issue812
PR for fixing issue812.
2017-01-23 11:42:13 -08:00
Umer Khan d90c266151 Merge pull request #809 from oliverschaefer/issue784
ORKSignatureView invalid graphics context bugfix
2017-01-23 11:23:31 -08:00
Umer Khan a5115044eb Merge pull request #889 from rsanchezsaez/result-predicate-comment
[ORKResultPredicate] Clarify comment on '+ predicateForConsentWithRes…ultSelector:didConsent:' usage
2017-01-23 11:22:35 -08:00
Umer Khan d0fc7490fd Merge pull request #872 from Sage-Bionetworks/pr/fix-audio-task-start-resume-bug
Fix audio step duplicate file creation bug
2017-01-23 11:22:03 -08:00
Umer Khan e6c4055dec Merge pull request #892 from rsanchezsaez/rss/warning-fixes
[Misc] Fix warnings
2017-01-23 11:21:14 -08:00
Shannon Young 8c1a53cfdf Add answer format for handling a multiple component picker. 2017-01-20 15:48:12 -08:00
Shannon Young 1635216e5c Merge branch 'master' into pr/update-healthkit-answerformat 2017-01-19 13:20:03 -08:00
Ricardo Sanchez-Saez f616083f3c [ORKSignatureView] Increase height and distance of signing line to bottom 2017-01-18 19:54:27 -08:00
DanKeen a4991240e2 Merge pull request #893 from coreygans/patch-1
Update ChartsAndGraphs-template.markdown
2017-01-17 13:41:34 -08:00
coreygans ac0817adf1 Update ChartsAndGraphs-template.markdown
Needed to change the Chart1.png to chart1.png so that the link would resolve.
2017-01-17 10:14:32 -08:00
Ricardo Sanchez-Saez bdf5f25335 [Projects] Update last upgrade checks to Xcode 8.2 2017-01-09 23:35:09 -08:00
Ricardo Sanchez-Saez 849aba6a3d [ORKStepHeaderView] Fix nil attribute warning 2017-01-09 23:26:09 -08:00
Ricardo Sanchez-Saez 5e08420307 [Charts] Add IB sample data source for bar graph
Also, fix an issue in which each data source subclass needs its own 'sharedInstance' method.
2017-01-08 13:23:42 -08:00
Ricardo Sanchez-Saez ad08365514 [Charts] Better encapsulation of IB_DESIGNABLE sample data sources
Also, fix typos due to 'ORKRangedPoint' to 'ORKValueRange' rename.
2017-01-08 11:57:49 -08:00
Shannon Young 1f574ba055 Add missing method call that was lost by merge. 2017-01-06 00:00:28 -08:00
Ricardo Sanchez-Saez 956e338c98 [ORKResultPredicate] Clarify comment on '+ predicateForConsentWithResultSelector:didConsent:' usage 2017-01-05 19:56:56 -08:00
Shannon Young 017a28e736 Added unit test and additional comments for usage. 2017-01-05 14:32:39 -08:00
Shannon Young 48e5e0baf7 consolidate getting or creating a previous result. 2017-01-03 16:50:43 -08:00
Shannon Young 607c96b5d3 Change trailmaking identifiers to ork_extern 2016-12-22 19:51:39 -08:00
Shannon Young 8b7eb71b1f Update externally defined healthkit string enums. 2016-12-22 19:48:32 -08:00
Shannon Young c8a43499c5 Merge branch 'master' into pr/ui-step-footnote
# Conflicts:
#	ResearchKit/Common/ORKInstructionStep.m
#	Testing/ORKTest/ORKTest/MainViewController.m
2016-12-20 16:50:06 -08:00
Umer Khan 02828eff5a Merge pull request #763 from md0u80c9/predicateTests
PredicateTests
2016-12-20 18:14:26 -06:00
Umer Khan 06f16e780b Merge pull request #825 from Sage-Bionetworks/pr/fix-nil-startDate
Always set a date for non-nil ORKResult startDate
2016-12-19 18:02:54 -06:00
Umer Khan e4918e28bd Merge pull request #861 from rsanchezsaez/typos
[Misc] Fix some typos
2016-12-16 15:38:05 -08:00
Shannon Young 919ba1e7b2 Fix the class of the trialmaking task and remove duplicate text. 2016-12-15 11:09:10 -08:00
Shannon Young e8e00503a4 set type for the trailmaking result array of taps. 2016-12-14 23:37:10 -08:00
Shannon Young bf0450af0a Merge branch 'master' into third-party/add-module-trailmaking-test
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
2016-12-14 15:32:57 -08:00
Shannon Young 7752710d0a Fix serialization tests 2016-12-14 15:30:58 -08:00
Shannon Young c7ac9c9a35 Merge branch 'master' into pr/update-healthkit-answerformat 2016-12-14 15:17:28 -08:00
Shannon Young e57fa02765 Fix serialization tests 2016-12-14 15:17:03 -08:00
Shannon Young d42cc93683 Merge branch 'master' into pr/ui-completion-step-done-button
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
2016-12-14 15:01:14 -08:00
Shannon Young 4ad73b30e4 Fix serialization tests 2016-12-14 14:54:13 -08:00
Shannon Young f885de099b Merge branch 'master' into pr/ui-add-ORKPageStepViewController
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
2016-12-14 14:46:40 -08:00
Shannon Young 8abaa9e3d7 Merge branch 'master' into pr/tablestep-source 2016-12-14 14:35:46 -08:00
Shannon Young f50bfc7ff6 Fix serialization tests 2016-12-14 14:28:59 -08:00
Shannon Young c737c14188 Merge branch 'master' into pr/fix-tremor-navigation 2016-12-14 12:24:34 -08:00
Umer Khan 67dbd30e87 Merge pull request #838 from Sage-Bionetworks/pr/ui-step-header-image
Added property to instruction set to allow setting icon image on header view.
2016-12-14 11:40:36 -08:00
Shannon Young 75b7c2d4e3 Merge branch 'master' into pr/ui-step-footnote 2016-12-14 11:31:15 -08:00
Shannon Young 449b4c056f Merge branch 'master' into pr/ui-step-header-image 2016-12-14 11:06:59 -08:00
Umer Khan 92d63e3a8b Merge pull request #862 from rsanchezsaez/serialization-tests
[ORKESerialization] Fix ORKLocation unit tests
2016-12-14 10:44:29 -08:00
Umer Khan 33dd18300d Merge pull request #831 from doreilly/correct-ios10-layout-bugs
Revert ResearchKit PR #806
2016-12-13 14:17:51 -08:00
Umer Khan b77119a510 Merge pull request #842 from 2020Deception/master
fixes crash when tapping results on ORKCatalog
2016-12-13 14:00:20 -08:00
Shannon Young ce0cfe50f3 More project keys 2016-12-13 13:02:54 -08:00
Shannon Young 69160ed4a4 More fixes for project pointers 2016-12-13 12:52:50 -08:00
Shannon Young 8819cefdd7 Remove references to private developer team 2016-12-13 12:46:06 -08:00
Shannon Young d238065e25 Fixed ORKTest serialization for trailmaking objects. 2016-12-13 11:48:20 -08:00
Faraz Hussain 89d1860902 Trail Making Test complete 2016-12-13 07:55:11 -08:00
Roland Rabien ea113f7b66 Make buttons tapped in error turn red 2016-12-12 16:36:28 -08:00
Roland Rabien 677e6db943 Adding the Trails active task to the ORKCatalog app 2016-12-10 08:46:32 -08:00
Roland Rabien aef19ea441 Add ORKTrailmakingStep to ResearchKit 2016-12-09 14:30:21 -08:00
Steve Roy c41536905e Fixed typo. 2016-12-09 10:33:36 -05:00
Steve Roy ba5e03e247 Replaced !(==) by !=. 2016-12-09 10:32:58 -05:00
Steve Roy e88c3ad800 Modify ORKPasscodeStepViewController to account for the flow type possibly being changed to authentication while in a task. 2016-12-09 10:30:46 -05:00
Shannon Young 97b680d61e Constrain the width of the icon image. 2016-12-08 16:39:50 -08:00
Shannon Young 2cb6fea5bd Correct the constraints for icon image with no title. 2016-12-08 14:58:25 -08:00
Shannon Young 2508623efa Added property to instruction set to allow setting icon image on header view.
This allows an instruction step to display an icon image *above* the title and text for the image.
2016-12-08 14:58:24 -08:00
Steve Roy dcf59ccd67 Moved the passcodeFlow property and associated enums out of the internal header. 2016-12-08 15:24:16 -05:00
Erin Mounts 7448431a3a Fix audio step duplicate file creation bug
Start was getting called in viewDidAppear:, creating an audio file, and meanwhile the superclass viewDidAppear: had dispatched a block to main that then saw the recorder was started and called resume, creating another audio file, only one of which was included in the results, leaving the other which the caller didn't know about and wasn't aware needed to be deleted, using up storage space over time. The fix is to use the shouldStartTimerAutomatically flag to let the superclass viewDidAppear: start the recorder, rather than override that method in the audio step view controller to start it explicitly.
2016-12-02 07:56:38 -08:00
Shannon Young 0779f9ca1a Added methods to transform ResearchKit enum to HealthKit enum 2016-12-01 22:51:59 -08:00
Shannon Young 883004f331 Fixed issues with the health kit result unit. 2016-11-18 16:19:34 -08:00
Andrew Hill ed2ffabb8e Change wording of predicate test 3 2016-11-17 06:16:10 +00:00
Shannon Young dd96c41fa5 Add missing HealthKit characteristic types to answer format.
This commit does a few changes:

1. Add the missing characteristics of Fitzpatrick Skin Type and Wheelchair Use to the `ORKHealthKitCharacteristicTypeAnswerFormat`

2. Add `shouldRequestAuthorization` flag to both defined HealthKit answer format subclasses to allow *not* requesting authorization for access to HealthKit if this does not meet the UI/UX requirements for the app.

3. Publicly expose the `impliedAnswerFormat` method to allow for subclasses to replace the default implied answer format with their own representation.
2016-11-15 11:28:18 -08:00
Andrew Hill a4f69dca57 Slight question changes (from R. Sanchez-Saez's review). 2016-11-15 07:33:00 +00:00
Andrew Hill 9eba881ce2 Removed unnecessary optional lines. 2016-11-14 23:55:55 +00:00
Shannon Young aa9596b4bb Fix typos 2016-11-14 11:18:05 -08:00
Andrew Hill e1103d8547 Style changes and fix to regular expressions following review by Ricardo Sanchez-Saez. 2016-11-14 07:06:55 +00:00
Ricardo Sanchez-Saez a0a74e83e7 [ORKDataCollectionTets] Fix '-testDelegateRejectDelivery' tests
Also:
- Rename 'testDelegateRejectDelivery' to 'testDataCollectionDelegateDeliveryRejection'.
- Reorder code for consistency between 'testDataCollection' and 'testDataCollectionDelegateDeliveryRejection'
- Rename 'testDataCollectionWithoutCollector' to 'testDataCollectionWithoutCollectors'.
- Remove needless whitespace and fix padding.
2016-11-13 20:10:59 -08:00
Ricardo Sanchez-Saez 8c8072cdec [ORKOperation] Fix error message typos 2016-11-13 20:04:15 -08:00
Umer Khan 7a4dd58df6 Merge pull request #746 from vtourraine/timed-walk-back-instructions
[ORKTimedWalkStepViewController] Add Turn Around step
2016-11-09 13:10:57 -08:00
Vincent Tourraine 8314e7d9a1 Update Swift syntax 2016-11-09 16:30:07 +01:00
Vincent Tourraine 7696d28f05 Merge upstream master 2016-11-09 16:26:09 +01:00
Umer Khan c4fe887fe5 Merge branch 'master' of https://github.com/ResearchKit/ResearchKit
* 'master' of https://github.com/ResearchKit/ResearchKit:
  templatized arrays
  [Projects] Update to Xcode 8.1 recommended settings
  Implementing @umerkhan-apple comments
  Fix typo in podspec version quoting characters.
  Touch Anywhere Active Task Range of Motion Active Tasks:       - Knee       - Shoulder
2016-11-08 17:44:12 -08:00
Umer Khan f38e31936e Merge pull request #863 from malhal/master
Templatized arrays in ORKOrderedTask.m
2016-11-08 11:58:02 -08:00
Umer Khan 339d364b40 Merge pull request #860 from rsanchezsaez/xcode-8.1
[Projects] Update to Xcode 8.1 recommended settings
2016-11-08 11:56:40 -08:00
Umer Khan 519ad1aaf9 Merge pull request #816 from darrenlevy/range-of-motion
Range of Motion Active Task
2016-11-08 11:52:45 -08:00
Malcolm Hall 203f48f8dc templatized arrays 2016-11-08 17:16:43 +00:00
Ricardo Sanchez-Saez a4cb2723da [ORKDataCollectionTests] Fix some typos 2016-11-08 01:11:11 -08:00
Ricardo Sanchez-Saez cb4e06a4c9 [ORKESerialization] Fix CLCircularRegion unit tests 2016-11-08 00:53:22 -08:00
Ricardo Sanchez-Saez 01f4312dce [Misc] Fix some typos 2016-11-07 22:50:24 -08:00
Ricardo Sanchez-Saez f1457b69b1 [Projects] Update to Xcode 8.1 recommended settings 2016-11-07 22:34:12 -08:00
Ricardo Sanchez-Saez 692ec6e007 [ORKESerialization] Add extra ResearchKit import to silence error 2016-11-07 22:30:33 -08:00
Ricardo Sanchez-Saez 28ceb9ebe5 [Umbrella headers] Change #imports to framework format 2016-11-07 22:14:17 -08:00
Darren Levy 9a69dbbd67 Implementing @umerkhan-apple comments 2016-11-07 18:08:15 -05:00
Shannon Young 9bd4df0996 Fix default initializer warnings. 2016-11-01 12:01:27 -07:00
Shannon Young 7dd98c8033 Fix init for ORKKeyValueStepModifier 2016-11-01 11:04:18 -07:00
Shannon Young b3934066ed Allow setting checkmark color and hide cancel. 2016-10-28 14:29:50 -07:00
Umer Khan 6089b09963 Merge pull request #853 from ryanschneider/podspec-fix
Fix typo in podspec version quoting characters.
2016-10-27 14:42:33 -07:00
Shannon Young 57058a66f5 Allow option check of default result source before using previous. 2016-10-27 12:29:53 -07:00
Ryan Schneider 87a7a6a718 Fix typo in podspec version quoting characters. 2016-10-27 11:26:15 -07:00
Umer Khan 0e5f58736a Merge branch 'master' of https://github.com/ResearchKit/ResearchKit
* 'master' of https://github.com/ResearchKit/ResearchKit: (113 commits)
  Updating podspec
  Updating podspec.
  convergence
  Convergence
  Fixed width constraint priority
  Make ORKInstructionStepViewController and ORKCompletionStepViewController public
  Add comment to the aux image.
  Add example use of the auxillary image.
  created the touchIdEnabled serializable encoding, confirm all tests pass
  Typo in function name
  Add ORKTappingButtonIdentifier rather than NSInteger
  added taskViewController didChangeResult implementation example to show how to get the ORKPasscodeResult information in the delegate
  Fix merge errors
  as per PR comment edited the ORKPasscodeResult to handle a new boolean property touchIdEnabled, in encoding/decoding, copying, and description
  removed the forced taskViewController delegate call from the ORKPasscodeStepViewCOntroller as its already calling it on its own, so no need for double
  added the delegate call when the prompt for touchID call is complete
  Erased asterisk/pointer from my last pull request
  Fixing bug where timer label did not display
  invalid pointer updates (warning fixes)
  Fix documentation typo
  ...

# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/ActiveTasks/HKSample+ORKJSONDictionary.m
#	ResearchKit/Common/ORKTaskViewController.m
#	ResearchKit/Common/ORKTextButton.h
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
2016-10-26 13:49:10 -07:00
Umer Khan c1493b9c5c Merge pull request #851 from ResearchKit/podspec
Podspec
2016-10-26 13:09:39 -07:00
Umer Khan d47e835e8e Merge branch 'master' into podspec
* master:
  convergence
  Update pod spec version number.
  Declare ORKScrollToTopAnimationDuration and ORKCGFloatInvalidValue as extern in ORKHelpers.h; fixes #679
2016-10-26 13:08:56 -07:00
Umer Khan 4b456ad2bb Merge pull request #850 from ResearchKit/stable
Stable
2016-10-26 12:48:49 -07:00
Umer Khan 125ff93795 Updating podspec 2016-10-26 12:40:56 -07:00
Umer Khan 2a1bbeefe8 Merge branch 'master' into stable
* master: (346 commits)
  Updating podspec.
  Convergence
  Fixed width constraint priority
  Make ORKInstructionStepViewController and ORKCompletionStepViewController public
  Add comment to the aux image.
  Add example use of the auxillary image.
  created the touchIdEnabled serializable encoding, confirm all tests pass
  Typo in function name
  Add ORKTappingButtonIdentifier rather than NSInteger
  added taskViewController didChangeResult implementation example to show how to get the ORKPasscodeResult information in the delegate
  Fix merge errors
  as per PR comment edited the ORKPasscodeResult to handle a new boolean property touchIdEnabled, in encoding/decoding, copying, and description
  removed the forced taskViewController delegate call from the ORKPasscodeStepViewCOntroller as its already calling it on its own, so no need for double
  added the delegate call when the prompt for touchID call is complete
  Erased asterisk/pointer from my last pull request
  Fixing bug where timer label did not display
  invalid pointer updates (warning fixes)
  Fix documentation typo
  Update ORKPicker.m
  Documented the ORKPicker functions.
  ...

# Conflicts:
#	ResearchKit.podspec
#	ResearchKit/ResearchKit.h
#	ResearchKit/ResearchKit_Private.h
2016-10-26 12:36:20 -07:00
Umer Khan ddc023fd4c Merge pull request #849 from ResearchKit/podspec
Updating podspec.
2016-10-26 11:31:58 -07:00
Umer Khan 160bb111f0 Updating podspec. 2016-10-26 11:31:36 -07:00
Shannon Young 737fa76bc9 Fix another typo in comment 2016-10-25 12:05:10 -07:00
Shannon Young a1b84fbf1e Fix typo in comment. 2016-10-25 11:05:40 -07:00
Shannon Young 82eb17de13 Add ORKStepModifier to navigable task.
`ORKStepModifier` was designed to allow optional modifications to an existing step in an  `ORKNavigableOrderedTask`. This allows changing the step based on navigation results. This class is used to fix a bug with the spoken instruction in the tremor task if the participant skips performing the task with one of their hands.
2016-10-25 10:00:04 -07:00
Shannon Young 5c3072b791 Remove TODO warning. 2016-10-24 11:17:30 -07:00
Shannon Young 740a7a4bf7 Fix resultForIdentifier to use reverse-enumeration to get last result. 2016-10-20 13:03:20 -07:00
Shannon Young 5029c7f3a8 Update to ORKTableStepViewController to use plain-style table for single section. 2016-10-20 11:29:13 -07:00
Shannon Young 4cac405737 Update the ORKTableStepViewController to use a protocol for the source
Replace the pointer in `ORKTableStepViewController` to `ORKTableStep` with a protocol. This will allow subclasses of `ORKStep` that do not subclass from `ORKTableStep` to implement the protocol instead. For example, a subclass of `ORKFormStep` that uses custom cells for the display of form items.
2016-10-18 12:11:56 -07:00
Brian Bowman 4025e0f427 fixes crash when tapping results
checks for results instead of assuming they are present
2016-10-15 13:50:04 -04:00
Shannon Young 67643271ae Add footnote label displayed at the bottom of an instruction or form step.
This is useful in displaying disclaimer or copyright information.
2016-10-13 12:40:04 -07:00
Shannon Young e207270b5d Add a flag to allow displaying the continue button in the standard position for the compltion step.
We are finding that many of our users are confused as to how to dismiss a task because the continue button is moved to the upper right corner for the last step.  This commit allows overriding the default behavoir of moving that button and places it in the standard position for a continue button.
2016-10-12 11:26:45 -07:00
Shannon Young cdc8edf78f Track the initial results separately from the mutating results set. 2016-10-03 11:35:42 -07:00
Darren Levy f5b3bbc4dd Touch Anywhere Active Task
Range of Motion Active Tasks:
      - Knee
      - Shoulder

    The Touch Anywhere Active Task was included to allow the user to get their device in the proper position before beginning the Range of Motion Step.

    Range of Motion's result contains two properties: flexed and extended. These correspond to the measurements a doctor may read when using a goniometer.
2016-10-02 15:39:46 -04:00
doreilly ef0164900a Revert ResearchKit PR #806
Reverted Pull Request #806 to fix errors identified in ResearchKit issue #824
2016-09-29 11:46:58 -04:00
Shannon Young b08a2a8627 Merge branch 'master' into pr/ui-add-ORKPageStepViewController
# Conflicts:
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
2016-09-28 13:21:13 -07:00
Shannon Young 90c2ee018e Fix navigation looping to return unique results for each step.
Previous to this commit, `ORKTaskViewController` only tracked the *last* result, inserting that result into the returned array of results for each instance of the step result with that identifier. This commit fixes that bug so that an `ORKNavigableOrderedTask` with a looping navigation will return the unique result for each loop.
2016-09-28 12:59:53 -07:00
Shannon Young cc1bfbf7eb Always set a date for non-nil ORKResult startDate 2016-09-28 12:57:08 -07:00
Shannon Young ea6b1278ce Change memory copyright to be a learn more link 2016-09-28 12:55:28 -07:00
Shannon Young 956e846eb4 There is a copyright that should be included with the memory game. 2016-09-28 12:55:28 -07:00
Yuan Zhu 30742a5043 convergence 2016-09-27 13:42:56 -07:00
Yuan Zhu ead0650dfb Convergence 2016-09-26 22:23:17 -07:00
Yuan Zhu 358ffcab78 Update README.md 2016-09-26 14:56:43 -07:00
Vincent Tourraine cc6bfe72e5 [ORKTimedWalkStepViewController] Fix progress view layout 2016-09-06 12:01:44 +02:00
Vincent Tourraine 7fe111b750 [ORKTimedWalkStepViewController] Add distinct method for turn around step #746 2016-09-06 11:57:26 +02:00
Vincent Tourraine 043f6258a3 Merge branch 'master' into timed-walk-back-instructions 2016-09-06 11:42:05 +02:00
Sebastian Ricaldoni 2f55113c11 Fixes issue around 'symbol not found...' when subclassing ORKQuestionStepCellHolderView
See https://github.com/ResearchKit/ResearchKit/issues/812
2016-09-01 16:38:56 -03:00
Oliver Schäfer 01e6728926 PR changes 2016-08-31 07:18:12 +02:00
Oliver Schäfer 9f03f45d1b PR changes 2016-08-31 07:17:37 +02:00
Oliver Schäfer 08dfa3fa8d Initial commit 2016-08-31 07:15:06 +02:00
Sam Lichlyter 26f2563a1a Added gesture recognizer to MapView for ORKLocationAnswerFormat 2016-08-30 13:36:24 -07:00
Yuan Zhu 4f3d0f33df Merge pull request #803 from Sage-Bionetworks/pr/public-ORKCompletionStepViewController
Make ORKInstructionStepViewController and ORKCompletionStepViewController public
2016-08-30 13:14:46 -07:00
Yuan Zhu 608d954197 Merge pull request #806 from asynchrony/fixed_width_constraint
Fixed width constraint priority
2016-08-30 10:25:18 -07:00
Joe Carroll 74326baef4 Fixed width constraint priority 2016-08-30 12:16:19 -05:00
Oliver Schäfer ed1aa683df PR changes 2016-08-27 10:32:20 +02:00
Oliver Schäfer 22589511bb Merge remote-tracking branch 'apple/master' into videoInstructionStep 2016-08-27 10:19:03 +02:00
Oliver Schäfer 4a00ebb8c5 PR changes 2016-08-27 10:15:04 +02:00
Shannon Young 1e3b3f24fa Merge remote-tracking branch 'origin/master' into pr/ui-add-ORKPageStepViewController
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
2016-08-26 11:25:40 -07:00
Shannon Young 5b1abe95c5 Make ORKInstructionStepViewController and ORKCompletionStepViewController public
We use a custom subclass of ORKInstructionStep which uses a custom implementation for learn more actions. By publicly exposing these view controllers, we can return the appropriate view controller (or subclass).
2016-08-25 15:37:48 -07:00
Yuan Zhu fe9c9e1fc5 Merge pull request #752 from Sage-Bionetworks/pr/add-module-hand-tremor
Add Hand Tremor Module
2016-08-24 11:06:16 -07:00
Shannon Young b8b7b80f09 Add comment to the aux image. 2016-08-26 10:46:57 -07:00
Oliver Schäfer c204c39daa play button with sharp edges 2016-08-23 13:12:58 +02:00
Oliver Schäfer d9198f5d13 PR changes 2016-08-23 13:07:10 +02:00
Oliver Schäfer 8c98958d17 PR changes 2016-08-23 13:02:30 +02:00
Umer Khan 1bcc12bd80 Merge pull request #792 from boland25/feature/touchIDReportResults
Feature/touch ID report results of if touchID was chosen in Passcode Setup
2016-08-22 14:21:40 -07:00
Shannon Young eb9464b6ce Add example use of the auxillary image. 2016-08-22 11:09:42 -07:00
Yuan Zhu c476ad838e Merge pull request #798 from gmw/master
Typo in function name
2016-08-22 10:06:28 -07:00
Gregory Boland c167e4d84c created the touchIdEnabled serializable encoding, confirm all tests pass 2016-08-22 11:01:15 -04:00
Oliver Schäfer cc18572956 Merge remote-tracking branch 'apple/master' 2016-08-21 18:31:30 +02:00
Oliver Schäfer fe2e5820c4 PR changes 2016-08-21 18:27:48 +02:00
Oliver Schäfer 85bea88d6a PR changes 2016-08-21 17:56:43 +02:00
Magnus Wissler 77eb12636a Typo in function name 2016-08-21 12:02:11 +02:00
Umer Khan 27f4197374 Merge pull request #654 from m1entus/master
Adding tap duration to Tapping Task Issue #561
2016-08-19 12:47:11 -07:00
Michal Zaborowski 34f473d8e5 Add ORKTappingButtonIdentifier rather than NSInteger 2016-08-19 20:47:01 +02:00
Shannon Young 396b9c8e13 Clean up and clearly differentiate between ORKPageStep and ORKNavigablePageStep 2016-08-18 22:37:44 -07:00
Shannon Young 937e615377 Hide the implementation detail of using a pageTask from the base class of ORKPageStep 2016-08-18 18:58:50 -07:00
Shannon Young 6e052a8b1a Fix back button for the case where this is the first step in the subtask 2016-08-18 17:11:48 -07:00
Steve Moser b71eb952b3 Merge branch 'ResearchKit/master' 2016-08-17 20:24:12 -04:00
Oliver Schäfer c6bb31f514 PR changes 2016-08-17 23:14:53 +02:00
Oliver Schäfer 24c540e70c Merge remote-tracking branch 'apple/master' 2016-08-17 23:11:12 +02:00
Oliver Schäfer 0361f242a0 PR changes 2016-08-17 21:51:45 +02:00
Oliver Schäfer 9d614ded2e Merge branch 'master' into videoInstructionStep 2016-08-17 21:41:35 +02:00
Gregory Boland 42b9907579 added taskViewController didChangeResult implementation example to show how to get the ORKPasscodeResult information in the delegate 2016-08-17 10:08:15 -04:00
Shannon Young 3e9cc99324 Fixed outdated comment 2016-08-16 13:46:19 -07:00
Shannon Young 43ce339890 Fix merge errors 2016-08-16 13:42:46 -07:00
Shannon Young 3be5fe1925 Merge remote-tracking branch 'origin/master' into pr/ui-add-ORKPageStepViewController
# Conflicts:
#	ResearchKit/ResearchKit.h
#	ResearchKitTests/ORKStepTests.m
2016-08-16 13:27:36 -07:00
Shannon Young 67a04562d6 Fix merge errors 2016-08-16 13:15:51 -07:00
Shannon Young f86668e8cb Merge branch 'master' into pr/add-module-hand-tremor 2016-08-16 12:46:10 -07:00
Yuan Zhu 33ca348856 Merge pull request #770 from rsanchezsaez/rsanchezsaez-charts
[Charts] Fix crashes
2016-08-16 12:22:22 -07:00
Gregory Boland bccef20ce5 as per PR comment edited the ORKPasscodeResult to handle a new boolean property touchIdEnabled, in encoding/decoding, copying, and description 2016-08-16 15:00:53 -04:00
Yuan Zhu 0f92862e52 Merge pull request #772 from md0u80c9/funcComments
Documented the ORKPicker functions.
2016-08-16 11:24:34 -07:00
Yuan Zhu c7a8cdd2c0 Merge pull request #764 from dephillipsmichael/bad_access_fix
bad_access_fix
2016-08-16 11:22:19 -07:00
Yuan Zhu 75142028b0 Merge pull request #648 from rsanchezsaez/rsanchezsaez-CodeHomogenization2
[Misc] #import section refactor to reduce header interdependency
2016-08-16 11:20:48 -07:00
Yuan Zhu d618d45635 Merge pull request #647 from weijentu/master
ORKQuestionResult could get truncated Chinese texts
2016-08-16 11:04:20 -07:00
Yuan Zhu 7a33c6b4a7 Merge pull request #789 from phantomkirby/patch-2
Erased asterisk/pointer from my last pull request
2016-08-16 10:46:50 -07:00
Gregory Boland add20301a1 removed the forced taskViewController delegate call from the ORKPasscodeStepViewCOntroller as its already calling it on its own, so no need for double 2016-08-16 11:48:22 -04:00
Gregory Boland fbc4dde858 added the delegate call when the prompt for touchID call is complete 2016-08-16 11:38:44 -04:00
Ricardo Sánchez-Sáez 18b6557cf3 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization2
# Conflicts:
#	ResearchKit/Charts/ORKGraphChartView.m
2016-08-13 10:56:09 -07:00
Cherry c195cf1a16 Erased asterisk/pointer from my last pull request
In my last pull request (#788) that was merged, I forgot to delete the "*" symbol. This actually caused the build to fail. The build should work now. Sorry about this!
2016-08-12 21:10:56 -04:00
Yuan Zhu 6679fb0922 Merge pull request #787 from 2020Deception/master
invalid pointer updates (warning fixes)
2016-08-12 15:23:46 -07:00
Yuan Zhu 740051812a Merge pull request #788 from phantomkirby/patch-1
Fixing bug where timerLabel did not display in ORKFitnessStep
2016-08-12 14:34:45 -07:00
Cherry 5c602d7850 Fixing bug where timer label did not display
in the updateTimerLabel function, the timer would be hidden if the labelString was null. The labelString was null everytime because the "formatter" object (an NSDateComponentsFormatter object) was null the whole time. This object was null because inside the "dispatch_once", we did not reference/edit the existing static formatter object outside of the dispatch_once, but rather, we instantiated a new formatter object.
2016-08-12 14:27:42 -04:00
Brian Bowman 0b4b2ae6e5 invalid pointer updates (warning fixes) 2016-08-12 11:41:02 -04:00
Yuan Zhu 0efee740e4 Merge pull request #778 from YuanZhu-apple/master_sliderGradient
Displaying a color gradient above the scale slider
2016-08-04 14:09:38 -07:00
Yuan Zhu 856d544fad Merge pull request #777 from YuanZhu-apple/master_lineGraphHideDots
Line graph hide dots
2016-08-04 14:09:03 -07:00
Yuan Zhu c257751d1d Merge pull request #776 from YuanZhu-apple/master_result_predicate_for_consentReviewStep
Result predicate for consent review step
2016-08-04 14:08:32 -07:00
Yuan Zhu 81e879e8f6 Merge pull request #775 from YuanZhu-apple/master_piechart_scale_factor
Piechart add scale factor support
2016-08-04 14:08:12 -07:00
Yuan Zhu ddeed599df Merge pull request #773 from ThreadResearch/master
Fix documentation typo
2016-08-01 13:44:03 -07:00
Jake Krog 65f525ff38 Fix documentation typo 2016-08-01 11:32:10 -07:00
Andrew Hill 60bfacf507 Merge remote-tracking branch 'origin/funcComments' into funcComments 2016-08-01 18:35:13 +01:00
Andrew Hill 0eae7e87f7 Update ORKPicker.m
Fixed a conflict.
2016-08-01 18:23:58 +01:00
Andrew Hill 26597eb334 Merge branch 'master' into funcComments 2016-08-01 18:21:32 +01:00
Andrew Hill 44c5535a8d Merge remote-tracking branch 'ResearchKit/master' into funcComments
# Conflicts:
#	ResearchKit/Common/ORKPicker.m
2016-08-01 18:14:35 +01:00
Andrew Hill d06f070e83 Documented the ORKPicker functions. 2016-07-31 23:48:27 +01:00
Andrew Hill 633d31be97 Merge branch 'ResearchKit/master' 2016-07-30 00:23:15 +01:00
Ricardo Sánchez-Sáez 6936eb34ac [ORKPieChartPieView] Add support for segments of 0 value
Avoids crash if the dataSource returns 0 for any segment value.
2016-07-29 23:40:40 +01:00
Ricardo Sánchez-Sáez 40891abb63 [ORKGraphChartView] Make '-numberOfPlotsInGraphChartView' non-optional and make it default to 0 plots.
Avoids crash if the graph chart view is laid out before the dataSource is set.
2016-07-29 23:26:23 +01:00
Oliver Schäfer 90d403e62b PR changes 2016-07-29 22:54:02 +02:00
Oliver Schäfer 7f0ca4ec88 PR changes 2016-07-29 21:53:13 +02:00
Oliver Schäfer fc36bca1bd PR changes 2016-07-29 21:49:37 +02:00
Oliver Schäfer 951193cdb8 PR changes 2016-07-28 23:13:23 +02:00
Oliver Schäfer 0cb0f5c8ff PR changes 2016-07-28 22:57:23 +02:00
Oliver Schäfer 2ff5a335e2 Initial commit 2016-07-27 17:14:13 +02:00
Oliver Schäfer 6a222529af Merged remote-tracking branch master 2016-07-27 16:32:08 +02:00
Oliver Schäfer fd2edde5a4 Merge remote-tracking branch 'apple/master' 2016-07-27 16:29:37 +02:00
Shannon Young 38c379476b Expose method for going to a given step 2016-07-26 23:33:17 -07:00
Yuan Zhu f9b8e39876 Adds support for displaying a color gradient above the slider for scale answer formats.
In the simple case this can be used to show a scale from bad to good by setting.
2016-07-25 17:05:17 -07:00
Yuan Zhu e14d327e3b Adds support for drawing plots within a chart without individual data point indicators. 2016-07-25 13:58:48 -07:00
Ricardo Sánchez-Sáez b9bcd6713c Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization2
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/ActiveTasks/ORKCountdownStep.h
#	ResearchKit/Charts/ORKDiscreteGraphChartView.m
#	ResearchKit/Charts/ORKGraphChartView.m
#	ResearchKit/Charts/ORKGraphChartView_Internal.h
#	ResearchKit/Charts/ORKLineGraphChartView.m
#	ResearchKit/Charts/ORKPieChartLegendView.m
#	ResearchKit/Charts/ORKPieChartView.m
#	ResearchKit/Charts/ORKRangedPoint.h
#	ResearchKit/Charts/ORKRangedPoint.m
#	ResearchKit/Common/ORKAnswerFormat.h
#	ResearchKit/Common/ORKAnswerFormat_Internal.h
#	ResearchKit/Common/ORKAnswerTextView.m
#	ResearchKit/Common/ORKCompletionStep.h
#	ResearchKit/Common/ORKFormStep.m
#	ResearchKit/Common/ORKHeightPicker.h
#	ResearchKit/Common/ORKInstructionStep.h
#	ResearchKit/Common/ORKNavigableOrderedTask.m
#	ResearchKit/Common/ORKOrderedTask.m
#	ResearchKit/Common/ORKPasscodeStepViewController.m
#	ResearchKit/Common/ORKSignatureStepViewController.h
#	ResearchKit/Common/ORKSignatureStepViewController.m
#	ResearchKit/Common/ORKStepViewController.h
#	ResearchKit/Common/ORKTextButton.h
#	ResearchKit/Common/ORKTextFieldView.m
#	ResearchKit/Common/ORKTypes.h
#	ResearchKit/Consent/ORKConsentReviewStepViewController.m
#	ResearchKit/ResearchKit.h
#	ResearchKit/ResearchKit_Private.h
#	ResearchKitTests/ORKAnswerFormatTests.m
#	Testing/ORKTest/ORKTest/Charts/Charts.storyboard
#	Testing/ORKTest/ORKTest/DragonPokerStep.m
2016-07-25 21:52:13 +01:00
Shannon Young 45eb65e721 When going back to an ORKPageStep, go back to the last step with a result. 2016-07-25 13:08:31 -07:00
Yuan Zhu bc2801bb9e Result predicate for ORKConsentReviewStep
Add a result predicate for determining if the user selected accept or decline in a consent signature step, allowing for custom navigation rules, such as skipping to the end of a survey if the user does not consent.
2016-07-25 12:47:14 -07:00
Yuan Zhu ba78feb4dd Providing a scale factor property in ORKPieChartView. 2016-07-25 12:36:56 -07:00
Shannon Young 7099ed295a Add accessor for getting the individual step results 2016-07-21 16:00:09 -07:00
Shannon Young 963935d659 Allow initializing ORKPageStep with steps as a desgnated initializer 2016-07-21 10:36:02 -07:00
MDP 56a8bc1db3 added check if weak self vc has been dismissed 2016-07-18 14:28:02 -04:00
Andrew Hill 1aa39859e9 Added a series of Predicate tests to ORKTest. This should test a range of different predicate conditions and enable us to ensure that Predicates are working as expected.
NB predicate tests which use 'match' don't seem to be working as expected in these tests. In the choice match test we try to match against Cat*; but only an exact match for Cat seems to pass the test.

Test 7 - to check a text string for a match *og causes a SigAbt. This may be that the match strings are incorrect for these tests, or it may be an issue with the match predicate functions.
2016-07-17 04:54:10 +01:00
Ricardo Sánchez-Sáez e86ef34a75 Merge branch 'master' of github.com:rsanchezsaez/ResearchKit into rsanchezsaez-CodeHomogenization2
# Conflicts:
#	ResearchKit/Common/ORKSurveyAnswerCellForText.m
#	ResearchKit/Common/ORKTextFieldView.m
2016-07-14 23:58:01 +01:00
Shannon Young 64e6c8c9a7 Fix warnings and issues introduced with change to using a task. 2016-07-13 23:55:37 -07:00
Shannon Young 0f3c8a88b8 Update ORKPageStep default initializer to be json serializable. 2016-07-13 15:25:47 -07:00
Shannon Young b596e6580d Include a navigable task in the page step example. 2016-07-13 12:54:44 -07:00
Shannon Young ea848aacf9 Change ORKPageStep to use an ORKTask to navigate. 2016-07-13 12:35:43 -07:00
Shannon Young 99195dde40 Add ORKPageStep and ORKPageStepViewController
The ORKPageStep can be used to group a set of steps together and return a single flattened ORKStepResult for a group of steps. It uses a page step view controller to present the steps.
2016-07-12 18:08:03 -07:00
Shannon Young 912a8112fb Fix warning in ORKHeightAnswerFormat due to failure to properly cast 2016-07-11 15:04:58 -07:00
Shannon Young 27644a292c Fix merge conflicts 2016-07-11 15:04:19 -07:00
Shannon Young 3f2cb32b23 Merge branch 'master' into pr/add-module-hand-tremor
# Conflicts:
#	ResearchKit/Common/ORKOrderedTask.m
#	ResearchKit/Common/ORKSkin.m
2016-07-11 14:56:27 -07:00
Yuan Zhu d84944ac6a Merge pull request #702 from stevemoser/ipad-pro-12-9-support
Support for 12.9 inch iPad Pro
2016-07-11 12:54:15 -07:00
Yuan Zhu ebfbfcb900 Merge pull request #637 from rsanchezsaez/rsanchezsaez-CodeHomogenization
[Misc] Code homogenization
2016-07-11 12:49:30 -07:00
Ricardo Sánchez-Sáez 3bd27d6ebe Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization
# Conflicts:
#	ResearchKit/Common/ORKAnswerFormat.m
#	ResearchKit/Common/ORKAnswerFormat_Internal.h
#	ResearchKit/Common/ORKDefines.h
#	ResearchKit/Common/ORKHealthAnswerFormat.m
#	ResearchKit/Common/ORKHelpers.h
#	ResearchKit/Common/ORKQuestionStepViewController.m
2016-07-09 19:42:16 +02:00
Yuan Zhu e11440b036 Merge pull request #643 from rsanchezsaez/rsanchezsaez-ORKHeightAnswerFormat
[ORKAnswerFormat] Implement picker-based 'ORKHeightAnswerFormat'
2016-07-08 10:41:15 -07:00
Andrew Hill fdedb11fea Merge branch 'ResearchKit/master' 2016-07-08 17:09:29 +01:00
Ricardo Sánchez-Sáez 72a665b961 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization
# Conflicts:
#	ResearchKit/Consent/ORKConsentReviewStepViewController.m
2016-07-08 15:07:21 +02:00
Ricardo Sánchez-Sáez cfe04441ad Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.m
#	ResearchKit/Charts/ORKGraphChartView.m
#	ResearchKit/Charts/ORKRangedPoint.m
#	ResearchKit/Common/ORKHealthAnswerFormat.m
#	ResearchKit/Common/ORKNavigableOrderedTask.m
#	ResearchKit/Common/ORKOrderedTask.m
#	ResearchKit/Common/ORKPasscodeStepViewController.m
#	ResearchKit/Common/ORKSurveyAnswerCellForText.m
#	ResearchKit/Common/ORKTextButton.h
#	ResearchKit/Common/ORKTextFieldView.m
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
2016-07-08 15:05:24 +02:00
Ricardo Sánchez-Sáez 7fe3e227ad [ORKHeightPicker] Fix issue returning empty 'selectedLabelText' 2016-07-08 13:34:17 +02:00
Yuan Zhu 4d8f4f3bb1 Merge pull request #753 from Sage-Bionetworks/pr/fix-signature-warning
Fix cast warning introduced with ORKSignatureResult
2016-07-07 15:39:47 -07:00
Shannon Young e29e7f2b73 Fix cast warning introduced with ORKSignatureResult 2016-07-07 13:24:25 -07:00
Allen Tu f2e133676b Merge remote-tracking branch 'ResearchKit/master' 2016-07-07 11:09:11 -07:00
Shannon Young 0c898b4abb Language updates to more closely match the wording approved by our IRB. 2016-07-07 10:26:22 -07:00
Ricardo Sánchez-Sáez c1fa1ea154 [ORKHeightPicker] Use cm as the internal answer unit regardless of chosen locale 2016-07-07 18:08:38 +02:00
Ricardo Sánchez-Sáez f659531d77 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKHeightAnswerFormat
# Conflicts:
#	ResearchKit/Common/ORKHealthAnswerFormat.m
#	ResearchKit/Localized/en.lproj/ResearchKit.strings
2016-07-07 17:50:54 +02:00
Ricardo Sánchez-Sáez 6e22f94cf5 [ORKHeightPicker] Fix previous answer not being remembered
The _answerFormat ivar needs to be properly set before for the self.answer setter to work correctly.
2016-07-07 17:30:42 +02:00
Ricardo Sánchez-Sáez 88c7c87f28 [ORKHeightAnswerFormat] Fix documentation 2016-07-07 17:29:38 +02:00
Ricardo Sánchez-Sáez 6a9da73a8a [ORKCatalog] Add metric and USC height question step samples 2016-07-07 17:29:24 +02:00
Shannon Young 0f0448bff7 Fix ORKCatalog for updated tremor module 2016-07-07 00:28:21 -07:00
Shannon Young fd2c914b68 Add navigation rules to allow user to skip the steps for one hand. 2016-07-07 00:06:05 -07:00
Shannon Young 5122948de0 Add Tremot task to ORKTest 2016-07-06 16:51:25 -07:00
Erin-Mounts 19d3624658 Two-handed tremor task 2016-07-06 16:46:03 -07:00
Erin Mounts 4f68c2bf4e Allow excluding some active tasks from tremor test 2016-07-06 16:46:02 -07:00
Shannon Young 9e1ed9e070 Add initial tremor module 2016-07-06 16:46:01 -07:00
Shannon Young 9fb7562ce5 Add an auxillary image to the instruction view.
This is used in the tremor module to show a second image.
2016-07-06 16:46:01 -07:00
Yuan Zhu b1b25f9ac4 Merge pull request #751 from Sage-Bionetworks/pr/ui-public-signature-step
Add public ORKSignatureStep
2016-07-06 16:27:46 -07:00
Shannon Young a5b58c4c8e Add signaturePath to list of knownNotSerializedProperties 2016-07-06 16:23:31 -07:00
Yuan Zhu 66c7b86484 Merge pull request #743 from Sage-Bionetworks/pr/add-module-bilateral-tapping
Add task module for measuring bilateral tapping speed
2016-07-06 16:01:12 -07:00
Yuan Zhu 3ef94e0958 Merge branch 'master' of https://github.com/ResearchKit/ResearchKit
Conflicts:
	ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.m
	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
2016-07-06 15:58:23 -07:00
Shannon Young 7b850951ef More syntax changes 2016-07-06 15:45:48 -07:00
Shannon Young bd5f5bb231 Retain signature state on back navigation 2016-07-06 15:44:16 -07:00
Shannon Young 2526450391 More syntax cleanup. 2016-07-06 15:11:06 -07:00
Shannon Young 289a45c3dd Change undefined hand to unspecified. 2016-07-06 14:38:35 -07:00
Shannon Young 931c7d7728 More curly brace changes. 2016-07-06 12:06:15 -07:00
Shannon Young 6d52269995 Fixed syntax, updated copyright and fixed localized formatting. 2016-07-06 11:49:25 -07:00
Shannon Young f69401cae9 Added task for showing just the signature step to ORKTest
Note: ORKCatalog uses this step in the consent flow example and displays the result.
2016-07-06 11:42:41 -07:00
Shannon Young 3d57bf65b8 Moved ORKSignatureStep into Common 2016-07-06 11:21:25 -07:00
Shannon Young e7b75b5f88 Move default title/text for signature to ORKSignatureStep 2016-07-06 09:29:55 -07:00
Shannon Young 590bb25559 Update text for tapping skip button and hide once tapping started. 2016-07-05 21:59:11 -07:00
Shannon Young f7345070a9 Add public ORKSignatureStep
Change the consent signature view controller to a step view controller that is instantiated using an ORKSignatureStep and outputs an ORKSignatureResult. This will allow for customization of the consent process and use of the signature gathering step in other task work flows.
2016-07-05 17:36:42 -07:00
Yuan Zhu 558b5391a3 Merge pull request #732 from Sage-Bionetworks/pr/ui-add-ORKStepTableViewController
Added a general purpose step table view controller
2016-07-05 15:10:28 -07:00
Shannon Young 4ea6fc7d46 Updated comment in ORKTableStep 2016-07-05 14:51:05 -07:00
Shannon Young 2289b01f7c Modified method signature for bilateral tapping task and updated ORKTest and ORKCatalog 2016-07-05 14:35:02 -07:00
Shannon Young 4899548438 Deprecated two-finger tapping test without hand specified 2016-07-05 14:25:37 -07:00
Shannon Young bcc85b9a2c Updated tapping unit test to explicitly check for reverse-compatibility 2016-07-05 14:23:54 -07:00
Shannon Young 613d3a676c Move the two-handed tapping test into ResearchKit
# Conflicts:
#	ResearchKitTests/ORKTaskTests.m
2016-07-05 14:23:54 -07:00
Shannon Young e5fa2374ab Add UIImage method for mirroring a collection of images
This is a utility method for flipping an image so that the same image can be used in both left-hand and right-hand orientations.
2016-07-05 14:21:01 -07:00
Erin Mounts 859bbb4e17 Modifications to ORKTappingContentView to support resizing the view if skippable.
cherry-pick d5011e37606365f794c377dad45e73a721d6db00 (with some manual intervention because of massive changes to ORKTappingContentView in RK 1.3)
2016-07-05 14:21:01 -07:00
Shannon Young 9fe59ca7a8 Default ORKTableStepViewController to allowsSelection=NO and simplify cell registration. 2016-07-05 14:19:50 -07:00
Shannon Young b3d72ce28a Add ORKTableStep with a default implementation for supporting a basic data source 2016-07-05 14:19:50 -07:00
Shannon Young e421214098 Add to the comments describing intended usage of this class. 2016-07-05 14:18:57 -07:00
Shannon Young 53e19548c4 Edited comments 2016-07-05 14:18:57 -07:00
Shannon Young f3fdb66cf8 Added comments and updated copyright. 2016-07-05 14:18:57 -07:00
Shannon Young ead682b402 Add files to project and update copyright date 2016-07-05 14:18:57 -07:00
Erin Mounts aeb3849fd7 Make ORKTableStepViewController visible...
...in release builds (RK sets symbols to hidden by default in release builds)
2016-07-05 14:18:57 -07:00
Shannon Young b9af6508ac Added a general purpose step table view controller 2016-07-05 14:18:57 -07:00
Yuan Zhu 2ff97e4558 Merge pull request #747 from Sage-Bionetworks/pr/add-module-walk-back-and-forth
Add module for walking back and forth
2016-07-05 14:17:05 -07:00
Shannon Young 26da4d8e34 Added serialized properties on ORKActiveStep to ORKTest 2016-07-05 13:53:15 -07:00
Shannon Young 6ee2b47dc1 Updated copyright and halfway count property name 2016-07-05 13:37:29 -07:00
Shannon Young 84f806ee11 Add walk back and forth task to ORKTest 2016-07-05 12:58:26 -07:00
Shannon Young a24dc1ac56 Added unit tests to check the identifiers and half-way spoken count. 2016-07-05 12:57:29 -07:00
Erin Mounts c3618bb104 update pocket image. phone should be inserted speaker-side-out 2016-07-05 12:56:37 -07:00
Shannon Young 119b5f19d2 Add halfway spoken instruction to countdown for walking back and forth 2016-07-05 12:56:37 -07:00
Shannon Young 5195ed44f1 Add back-and-forth walking task 2016-07-05 12:56:37 -07:00
Shannon Young 755db8b700 Add finishedSpokenInstruction to active step
The finished spoken instruction property allows a step to announce that it is completed. This is useful in the case where the phone screen is not visible such as a walking activity (where the phone is in the participant's phone) or a hand tremor measurement (where the screen is not facing the participant).
2016-07-05 12:56:37 -07:00
Yuan Zhu 3d95111ace Merge pull request #735 from Sage-Bionetworks/pr/method-add-stepvc-init
Allow steps to instantiate the view controller
2016-07-05 12:26:55 -07:00
Shannon Young 859fc28d8a Fix deprecation warning 2016-07-01 16:39:33 -07:00
Shannon Young ebc4ccacc0 Move example for initializing a custom step view controller into ORKTest 2016-07-01 16:31:53 -07:00
Shannon Young 1c3aab92c1 Update the unit test to make it a little more interesting. 2016-07-01 16:28:12 -07:00
Shannon Young 70093149b5 Updated comment to add additional description. 2016-07-01 16:28:12 -07:00
Shannon Young d595a0b199 Add unit test for instantiating a view controller and expose stepViewControllerClass method 2016-07-01 16:28:12 -07:00
Shannon Young 764b5f8691 Allow steps to instantiate the view controller 2016-07-01 16:28:12 -07:00
Yuan Zhu 395eb936d5 Merge pull request #721 from Sage-Bionetworks/pr/public-continue-button
Make the continue button public for UI consistency
2016-07-01 16:14:15 -07:00
Yuan Zhu dcab7194c1 Merge pull request #727 from Sage-Bionetworks/pr/ui-should-confirm-cancel
Added delegate method for discarding results without confirming cancel.
2016-07-01 15:39:48 -07:00
Yuan Zhu 9c271d87f6 Merge pull request #726 from Sage-Bionetworks/pr/fix-audio-prompts
Fix audio-prompts-coming-from-earpiece bug
2016-07-01 15:32:37 -07:00
Shannon Young d9ebc6d253 Fixed copyrights and removed commented out code 2016-07-01 15:26:20 -07:00
Yuan Zhu 2e555356a6 Merge pull request #722 from Sage-Bionetworks/pr/ui-forgot-passcode
Forgot passcode with delegate methods matching existing pattern
2016-07-01 14:53:49 -07:00
Shannon Young 69c830b8cd Code cleanup and fix alert in ORKTest 2016-07-01 14:24:12 -07:00
Shannon Young a5aa647ed0 Remove delegate method for setting the tintColor 2016-07-01 13:40:32 -07:00
Shannon Young d7d923e609 Forgot passcode with delegate methods matching existing pattern 2016-07-01 13:40:32 -07:00
Shannon Young 0cbb21d71d Add missing comma 2016-07-01 13:06:48 -07:00
Shannon Young f5fe7a47f3 Added files to ORKTest for creating example continue button 2016-07-01 13:02:13 -07:00
Shannon Young cbea809430 Add Continue Button to ORKTest project 2016-07-01 13:02:13 -07:00
Shannon Young a65d5da62f Add test for example usage of continue button. 2016-07-01 13:02:13 -07:00
Shannon Young 49f2914063 Mark ORKTextButton_Internal with project 2016-07-01 13:02:13 -07:00
Shannon Young f50340c7e1 Make the continue button public for UI consistency 2016-07-01 13:02:13 -07:00
Yuan Zhu dfcc02d75f Merge pull request #639 from rsanchezsaez/rsanchezsaez-ORKHealthKitCharacteristicTypeAnswerFormat
[ORKHealthKitCharacteristicTypeAnswerFormat] Expose date picker attributes
2016-06-29 12:36:18 -07:00
Ricardo Sánchez-Sáez 6ad71820d8 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKHealthKitCharacteristicTypeAnswerFormat
# Conflicts:
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
2016-06-29 20:22:23 +01:00
Ricardo Sánchez-Sáez 275cc3ae17 [ORKJSONSerializationTests] Remove unneeded whitespace 2016-06-29 20:18:57 +01:00
Yuan Zhu 5f643fdcde Merge pull request #731 from Sage-Bionetworks/pr/audio-level-check
Added a optional ambient noise check to the voice task.
2016-06-29 10:57:14 -07:00
Shannon Young e444c32eb5 Add missing ORK_CLASS_AVAILABLE to ORKPredicateSkipStepNavigationRule 2016-06-29 10:55:54 -07:00
Shannon Young 7c7dfc4861 Added missing ORK_CLASS_AVAILABLE to headers 2016-06-29 10:44:59 -07:00
Shannon Young 9b9e941299 Add ORKAudioLevelNavigationRule to the tests for ORKSerialization 2016-06-28 17:58:44 -07:00
Shannon Young 27a0755414 Fix typo in documentation for audioTask with sound check 2016-06-28 16:31:48 -07:00
Shannon Young 0dfb3455f7 Update documentation and added unit test 2016-06-28 15:04:41 -07:00
Shannon Young 47d6b5e0f9 Change method signature and deprecate the old audioTask constructor 2016-06-28 14:45:41 -07:00
Shannon Young dbb0fcf2b7 Change name of step identifier property to destinationStepIdentifier 2016-06-28 14:45:41 -07:00
Shannon Young 170ca3e0b6 Added audio wiith sound check to ORKCatalog 2016-06-28 14:45:41 -07:00
Shannon Young 2c868e3bb4 Update copyrights and method signature 2016-06-28 14:45:41 -07:00
Shannon Young 1abd8bf548 Throw exception if recordingSettings dictionary is nil 2016-06-28 14:45:41 -07:00
Shannon Young 5db0f6422e Update copyright dates 2016-06-28 14:45:41 -07:00
Shannon Young 47f1a3bfd1 Added a optional ambient noise check to the voice task. 2016-06-28 14:45:41 -07:00
Yuan Zhu 231ed3f90c Merge pull request #738 from Sage-Bionetworks/pr/ui-confirm-answer-format
Expose method for instantiating an answer format for confirmation of another field.
2016-06-28 13:33:08 -07:00
Yuan Zhu dd465a00e7 Merge pull request #728 from Sage-Bionetworks/pr/public-ordered-task-step-index
Expose method for getting the index of a step from ORKOrderedTask
2016-06-28 13:24:14 -07:00
Yuan Zhu 05325d6070 Merge pull request #644 from rsanchezsaez/rsanchezsaez-Cocoapods
[Cocoapods] Fix podspec to include swift files
2016-06-28 10:22:41 -07:00
Vincent Tourraine 38a0394005 [ORKTimedWalkStepViewController] Add turn around time limit parameter
As suggested in #606
2016-06-28 17:14:58 +02:00
Vincent Tourraine 541e159792 [ORKTimedWalkStepViewController] Add Turn Around step to Timed Walk active task
Transfer changes from shazino:timed-walk-back-instructions, as discussed in #606
2016-06-28 17:08:07 +02:00
Shannon Young ee446da653 Added test for indexOfStep == NSNotFound 2016-06-27 16:38:38 -07:00
Shannon Young b39c2ea10d Add unit test for indexOfStep 2016-06-27 16:38:38 -07:00
Shannon Young 106b2d969f Remove ORKOrderedTask_Internal 2016-06-27 16:37:47 -07:00
Shannon Young cd02eefff7 Expose method for getting the index of a step. 2016-06-27 16:37:47 -07:00
Yuan Zhu 55b97af36a Merge pull request #633 from rsanchezsaez/rsanchezsaez-ORKBarGraphChart
[Charts] Implement ORKBarGraphChart
2016-06-27 16:22:34 -07:00
Shannon Young fa50f74e9c Throw assert on multiple lines - not currently supported. 2016-06-27 16:20:16 -07:00
Shannon Young 903e1cbffe Added example usage of confirmation form item to ORKTest 2016-06-27 16:20:16 -07:00
Shannon Young 4cda98e896 Clean up tab spacing for readability. 2016-06-27 16:18:19 -07:00
Shannon Young 525d5b2350 Added additional comment and tests for the confirmation answer form item. 2016-06-27 16:18:19 -07:00
Shannon Young 191c17930d Move confirm answer to ORKFormItem 2016-06-27 16:18:19 -07:00
Shannon Young cfe39f8201 Fix issue with autocapitolization 2016-06-27 16:18:19 -07:00
Shannon Young 4b35370e80 Expose method for instantiating an answer format for confirmation of another field.
This answer format is intended to be used with an `ORKFormStep` in order to confirm a previous formItem input. Example usage includes a password or participant identifier that is used to anonymously identify a study participant.
2016-06-27 16:18:19 -07:00
Yuan Zhu 2404b20433 Merge pull request #739 from Sage-Bionetworks/pr/ui-task-delegate-vc-will-disappear
Add delegate method to task view controller for step will disappear
2016-06-27 14:59:45 -07:00
Shannon Young a20f953467 Add example that uses the step will disappear method. 2016-06-27 14:36:45 -07:00
Shannon Young f41480f5bb Add unit test of the delgate callback 2016-06-24 12:18:45 -07:00
Shannon Young ddef74e9cc Updated comment and added direction to the method signature. 2016-06-23 17:31:48 -07:00
Yuan Zhu a50f7cbc2f Merge pull request #736 from Sage-Bionetworks/pr/fix-HKQuantityTypeRecorder
Fix ORKHealthQuantityTypeRecorder to allow for iOS 10 and iOS 8 support
2016-06-23 16:47:52 -07:00
Shannon Young 5715ea13c5 Update comment to match method signature. 2016-06-23 16:33:04 -07:00
Shannon Young 41575b830c Add delegate method to task view controller for step will disappear 2016-06-23 16:27:47 -07:00
Shannon Young c6907b1e9e Add comment explaining why tracking both object and uint 2016-06-23 14:46:41 -07:00
Yuan Zhu 286f49bb5d Merge pull request #737 from Sage-Bionetworks/pr/task-copy-with-steps
Copy the properties of an ORKOrderedTask (or subclass) and mutate the steps.
2016-06-23 14:00:35 -07:00
Yuan Zhu 59ac9c3213 Merge pull request #729 from Sage-Bionetworks/pr/fix-result-nullable-date
ORKResult start/end dates should not be nullable
2016-06-23 13:29:31 -07:00
Shannon Young 0cfce94dd6 Copy the properties of an ORKOrderedTask (or subclass) and mutate the steps. 2016-06-22 22:56:00 -07:00
Ricardo Sánchez-Sáez cb4ff44859 [Charts] Rename 'pointForPlotIndex:' (and related methods) to 'dataPointForPlotIndex:'
Also rename 'ORKGraphChartType' to 'ORKValueCollectionType'.
2016-06-23 02:51:02 +01:00
Shannon Young 0375b70146 Wrap the interface for iOS 8 HKAnchoredObjectQuery init
Use a #ifdef __IPHONE_10_0 to only expose the interface if it would not otherwise be available.
2016-06-22 13:29:19 -07:00
Shannon Young e9e2434d5f Add deprecation warning into protocol work-around for HK iOS 10 support 2016-06-22 11:45:13 -07:00
Shannon Young 72fb6d5138 Updated implementation for iOS 8 compatibility to HealthKit for iOS 10 2016-06-22 11:45:05 -07:00
Shannon Young 60aa464b02 Add work-around for missing method for HKAnchoredObjectQuery 2016-06-22 11:44:57 -07:00
Ricardo Sánchez-Sáez 8474d39cdf Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKBarGraphChart
# Conflicts:
#	ResearchKit/Charts/ORKGraphChartView.m
#	ResearchKit/Charts/ORKGraphChartView_Internal.h
#	ResearchKit/Charts/ORKLineGraphChartView.m
#	ResearchKit/Common/ORKHelpers.h
2016-06-22 03:09:42 +01:00
Erin Mounts 3f258d2c6c ORKResult start/end dates should not be nullable 2016-06-21 16:37:48 -07:00
Shannon Young aad49eac86 Added delegate method for discarding results without confirming cancel. 2016-06-21 16:12:25 -07:00
Shannon Young 4b610ee085 Log an error with restoring audio session but do not forward.
If an error occurs with restoring the saved audio session category, then log the error but otherwise ignore. Do not want to fail the task.
2016-06-21 15:49:05 -07:00
Yuan Zhu 78d59f7ed8 Merge pull request #636 from rsanchezsaez/rsanchezsaez-ORKNavigableOrderedTask
[ORKNavigableOrderedTask] Implement skip navigation rules
2016-06-21 15:12:32 -07:00
Shannon Young a147b2e6e3 Report error (if any) for restoring the saved audio session category 2016-06-21 14:54:46 -07:00
Yuan Zhu 78bc96956c Merge pull request #724 from Sage-Bionetworks/pr/update-module-voice-threshold
Audio ActiveTask View - add ability to define threshold value
2016-06-21 14:30:23 -07:00
Shannon Young 0e9ce26b82 Mark audio prompt property as copy rather than strong 2016-06-21 14:28:56 -07:00
Shannon Young e2f284a4cb Only update the view threshold if the view is loaded 2016-06-21 14:26:52 -07:00
Shannon Young 90af9211eb Only set the threshold if greater than 0 2016-06-21 14:25:15 -07:00
Shannon Young 1107bd9dba Do not set the initial threshold. Zero by default is ignored. 2016-06-21 14:22:04 -07:00
Yuan Zhu 4bcc83ecd3 Merge pull request #716 from king7532/swift3
Update `ORKPredicateStepNavigationRule` Swift 2.x formatting to match…
2016-06-21 14:19:27 -07:00
Ricardo Sánchez-Sáez aa86bf3bed [ORKNavigableOrderedTask] Return empty dictionaries instead of empty arrays 2016-06-21 21:51:00 +01:00
Erin Mounts 5de1888375 Fix audio-prompts-coming-from-earpiece bug
save the current AVAudioSession category before starting voice recording and then restore afterward
2016-06-21 13:20:51 -07:00
Everest Liu 01eab7bd0c PAN-98 - Audio ActiveTask View - add ability to define threshold value 2016-06-21 13:10:17 -07:00
Yuan Zhu 1da1d632b6 Merge pull request #718 from Sage-Bionetworks/pr/fix-defaultResultStore
Fix bug where the defaultResultSource is using ivar rather than public property accessor
2016-06-21 11:11:52 -07:00
Shannon Young 072d19c84b Fix bug where the defaultResultSource is using ivar rather than public property accessor 2016-06-21 11:06:27 -07:00
Yuan Zhu 11effe846e Merge pull request #625 from shazino/ib-graph-chart
Make chart and graph IBInspectable/IBDesignable
2016-06-21 10:18:53 -07:00
Umer Khan c185fce465 Merge pull request #583 from chb/feature/passcode-override
Improve Passcode View
2016-06-20 14:47:53 -05:00
Benjamin King 4863368e23 Update ORKPredicateStepNavigationRule Swift 2.x formatting to match the style guide 2016-06-20 15:07:39 -04:00
Yuan Zhu 1ce947395d Merge pull request #715 from king7532/swift3
Update extension to `ORKPredicateStepNavigationRule` to support Swift 3 and 2.x
2016-06-20 11:10:18 -07:00
Benjamin King c15b98e41a Update extension to ORKPredicateStepNavigationRule to support Swift 3 and 2.x 2016-06-18 21:32:37 -04:00
Andrew Hill 9341e85030 Merge branch 'ResearchKit/master' 2016-06-14 20:14:53 +01:00
Steve Moser 1934f143a5 Add suggested fixes for 12 iPad Pro metrics 2016-06-13 12:54:29 -04:00
Yuan Zhu 9b1efb8641 Merge pull request #707 from malhal/master
Fix for blank white screen when app activates back from viewing the N…
2016-06-10 14:30:59 -07:00
Malcolm Hall c1f30947be Fix for blank white screen when app activates back from viewing the NC or a privacy prompt 2016-06-08 20:09:11 +01:00
Steve Moser dc22fe8191 Add initial support for 12.9 inch iPad Pro
Needs feedback on naming and metrics
2016-06-03 15:11:43 -04:00
Yuan Zhu 888ff9aea3 Merge branch 'bugfix/26015217' into 'master'
Fix for <rdar://problem/26015217> Building ResearchKit against a iOS 9.0 or high…

Added compile time checks for new iOS 9.0 APIs to that they are called if the base SDK is newer.

See merge request !42
2016-05-18 10:15:14 -07:00
Yuan Zhu 8e2313118f Merge pull request #680 from apbendi/header-fix
Fix declaration of constants in ORKHelpers
2016-05-17 11:12:34 -07:00
Ben DiFrancesco 354cee7e7a Declare ORKScrollToTopAnimationDuration and ORKCGFloatInvalidValue as extern in ORKHelpers.h; fixes #679 2016-05-12 16:18:20 -04:00
Rajit Shinh 427b1a3aea Fix a few things that Yuan pointed out from code reviewing the changes. 2016-05-05 19:48:14 -07:00
Ricardo Sánchez-Sáez 7cfb8960c9 [ORKHeightPicker] Rename variables in internal method 2016-05-05 01:36:04 +01:00
Ricardo Sánchez-Sáez cabaecb5d1 [ORKHeightAnswerFormat] Use ORK_DECODE_ENUM() and ORK_ENCODE_ENUM() 2016-05-05 01:08:37 +01:00
Ricardo Sánchez-Sáez 99bd214f23 [Misc] Rename 'ORKNumberFormatter' to 'ORKDecimalNumberFormatter' 2016-05-05 01:04:07 +01:00
Umer Khan ea7c941424 Merge pull request #662 from dukemike/issues/658
allow plot fill color of ORKLineGraphChartView to be set by the delegate
2016-05-04 13:17:02 -07:00
Umer Khan 75e880e1d9 Merge pull request #653 from samfalconer/master
Update ORKSignatureView to support pressure sensitive stroke widths.
2016-05-03 11:07:35 -07:00
Oliver Schäfer 711f39eca9 Merge remote-tracking branch 'apple/master' 2016-05-03 17:01:49 +02:00
Rajit Shinh 13cfe54a3e Fix for <rdar://problem/26015217> Building ResearchKit against a iOS 9.0 or higher deployment target results in warnings. 2016-05-02 16:40:41 -07:00
Andrew Hill a788e35d25 Merge branch 'ResearchKit/master' 2016-05-02 10:50:32 +01:00
Yuan Zhu e9d7b847da Merge pull request #638 from evands/improve-vertical-slider-layout
Improved flexibility for laying out a vertical ORKScaleSliderView.
2016-04-29 13:47:56 -07:00
Yuan Zhu b0f5e2cbb7 Merge pull request #650 from dwarfland/master
Typo/case fix in #include
2016-04-28 16:38:31 -07:00
Oliver Schäfer 2e6643022e Merge remote-tracking branch 'apple/master' 2016-04-20 15:43:47 +02:00
Yuan Zhu 2c4ef0f73e Merge pull request #664 from ResearchKit/stable
Merge class visibility fix from Stable to Master
2016-04-19 17:12:02 -07:00
Mike Revoir 4ada9cf5ff Merge pull request #1 from rsanchezsaez/dukemike-issue-658
[ORKLineGraphChartView] Improvements to new fill color method
2016-04-14 10:56:03 -04:00
Ricardo Sánchez-Sáez 7b23d8b21e [ORKLineGraphChartView] Fix issue where fill color wasn't correctly obtained on updatePlotColors method
Also:
- Have points and lines to be drawn above their corresponding fill
- Move fillColorForPlotIndex: to ORKLineGraphChartView.m
- Minor headerdoc improvement
2016-04-13 20:01:57 +01:00
Ricardo Sánchez-Sáez d2f26a5ab9 [ORKTest] Add ORKLineGraphChartView's graphChartView:fillColorForPlotIndex: method test 2016-04-13 19:58:58 +01:00
Mike Revoir c170a8c38a reformat whitespace. refs #658 2016-04-13 10:56:54 -04:00
Mike Revoir 934aa3283b allow plot fill color to be set. refs #658 2016-04-13 10:56:47 -04:00
Sam Falconer 639f75eaa6 Merge if statements.
In addition to checking for 3D touch, check for Apple Pencil
to see if we can get force from that.
2016-04-06 18:11:01 -04:00
Michal Zaborowski 5f969da0d7 Adding tap duration to Tapping Task Issue #561 2016-04-06 19:49:58 +02:00
Sam Falconer 080c69bd8b Update ORKSignatureView to support pressure sensitive stroke widths.
Add property for setting the stroke width variation (default to 3pts).

If the device supports 3D touch, use the true pressure to determine
how thick the line should be at a given point.

If the device does not support 3D touch, use the speed of the stroke
to determine how thick the line should be at a given point.
2016-04-05 14:36:53 -04:00
Oliver Schäfer 44db125626 Merge remote-tracking branch 'apple/master' 2016-03-30 06:45:54 +02:00
Ricardo Sánchez-Sáez 42c12ca73f [ORKHeightAnswerFormat] Replace 'BOOL useMetricSystem' by 'ORKMeasurementSystem measurementSystem'
Valid values are:
- ORKMeasurementSystemLocal
- ORKMeasurementSystemMetric
- ORKMeasurementSystemUSC
2016-03-30 00:56:12 +01:00
Ricardo Sánchez-Sáez 025581ad55 [ORKHealthKitQuantityTypeAnswerFormat] Use 'ORKHeightAnswerFormat' as the impliedAnswerFormat when the quantity type is 'HKQuantityTypeIdentifierHeight 2016-03-29 21:53:30 +01:00
Ricardo Sánchez-Sáez 65aee797ce [ORKHealthKitCharacteristicTypeAnswerFormat] Move 'defaultDate', 'minimumDate', 'maximumDate' and 'calendar' default value calculation to impliedAnswerFormat's initialization
This prevents archiving of stale date and calendar values.
2016-03-29 20:47:46 +01:00
Yuan Zhu f7ea0167b1 Merge pull request #641 from rsanchezsaez/rsanchezsaez-ORKStepResult.enabledAssistiveTechnology
[ORKStepResult] Add 'enabledAssistiveTechnology' property
2016-03-29 12:39:21 -07:00
Ricardo Sánchez-Sáez a5a8531fdf [ORKStepResult] Rename 'checkEnabledAssistiveTechnology' to 'updateEnabledAssistiveTechnology' 2016-03-29 20:23:58 +01:00
Yuan Zhu e60db320ed Merge pull request #645 from rsanchezsaez/rsanchezsaez-ORKCountdownStep
[Framework] Expose ORKCountdownStep and ORKCompletionStep publicly
2016-03-29 11:08:23 -07:00
marc hoffman 8a6895d762 ORKWaitStepViewController.h was marked as private and thus missing (but needed) from compiled .framework 2016-03-29 11:26:53 -04:00
marc hoffman 2ac579a610 Type/case fix in #include 2016-03-29 11:20:57 -04:00
Ricardo Sánchez-Sáez 4b9ae8e404 [ORKTest] Fix small indentation misalign 2016-03-29 14:12:14 +01:00
Ricardo Sánchez-Sáez f7d1591c19 [Misc] Change all framework #imports to @import
Also:
- Change some #imports to directly refer headers instead of going though the framework header because it enables it be included as a module through Cocoapods.
- Improve unit test encapsulation by making some classes (recorders) and methods available in the private header
2016-03-28 20:06:58 +01:00
Ricardo Sánchez-Sáez 9b539d7faf [Misc] Remove needless #imports from ORKVerticalContainerView 2016-03-28 16:05:34 +01:00
Ricardo Sánchez-Sáez e515278b4c [Misc] Perform #import section refactor to reduce header interdependency
Compilation time after you modify a header file has been greatly improved by avoiding including the umbrella headers (ResearchKit.h and ResearchKit_Private.h) in any of the framework files.

Also:
- Restructure .m files #import section into a hierarchy of alphabetically sorted subsections separated by one newline (1. local views and controls; 2. view controllers and recorders; 3. model files; 4. general files and helpers, 5. iOS frameworks). The #import order follows advice found here: http://qualitycoding.org/import-order/
- Remove needless and duplicate imports from .m files
- Make sure all headers include at least Foundation or UIKit; except Private or Internal headers which only include their own class header at the next public level
- Rename ORKHelpers.h to ORKHelpers_Internal.h (it is not public, and its name was misleading given that we also have ORKHelpers_Private.h).
- Add a few missing NS_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_END annotation in headers
- Add a few missing double newline before and after import section
2016-03-28 15:34:27 +01:00
Oliver Schäfer c7be2b44ee Merge remote-tracking branch 'apple/master' 2016-03-28 13:20:22 +02:00
WEI-JEN TU e3b2d91a8b ORKQuestionResult could get truncated Chinese texts before textFieldDidEndEditing is called
ORKQuestionResult could get truncated Chinese texts before
textFieldDidEndEditing is called in UITextFieldDelegate

The repository “truncated-branch” is revised to be able to demonstrate
the scenario right away. Also uncomment line 202 in
ORKSurveyAnswerCellForText addresses the issue.

There are two videos as well to elaborate truncated Chinese texts and
difference between before and after.
Before: (Notice that the last character is always truncated before
textFieldDidEndEditing is called in UITextFieldDelegate)
https://db.tt/jHlCyr62

After:
https://db.tt/jeh1O20k
2016-03-26 12:07:17 -07:00
WEI-JEN TU da41b8a43b Merge remote-tracking branch 'ResearchKit/master' 2016-03-26 10:41:03 -07:00
Ricardo Sánchez-Sáez 86273181ac [Framework] Expose ORKCountdownStep and ORKCompletionStep publicly 2016-03-24 17:29:05 +00:00
Ricardo Sánchez-Sáez 930d94f804 [ORKSpatialSpanMemoryTask] Rename methods to avoid abbreviations and add step documentation
(Missing step documentation was causing broken links in the documentation.)
2016-03-24 17:08:56 +00:00
Ricardo Sánchez-Sáez d783c0b2b6 [Cocoapods] Fix podspec to include swift files 2016-03-24 15:23:50 +00:00
Ricardo Sánchez-Sáez 92cc2c0ef9 [ORKTest] Add 'ORKHeightAnswerFormat' step to review example
Fix review step text output which was showing total inches instead of decomposed feet and inches.
2016-03-24 15:20:57 +00:00
Ricardo Sánchez-Sáez 275b7b5ff9 [ORKAnswerFormat] Implement picker-based 'ORKHeightAnswerFormat'
Details:
- Metric and imperial measuring systems support
- Standalone question steps and on form steps support
- Serialization unit tests implemented

Notes:
- For input it uses the newly added 'ORKHeighPicker' class
- Height limits and default value are hardcoded into the picker, taking the same values as the Health App: [0 ft, 0 in - 9 ft, 11 in] range, default: 5 ft, 4 in; [0 cm - 299 cm] range, default: 162 cm
- Results are output as an 'ORKNumericResult' object, with the unit canonically set to 'in' or 'cm' depending on the chosen measuring system (on the imperial system, feet and inches always get converted to total inches when stored in the outputted result)
- Visually, the picker and the chosen answer in form steps display the 'cm' and decomposed 'ft in' values, with their units localized if applicable (unlike the canonical result units which are never localized)
2016-03-24 14:51:36 +00:00
Ricardo Sánchez-Sáez 642f87576a [Misc] Avoid some abbreviations and needless intermediate variables 2016-03-23 17:43:44 +00:00
Ricardo Sánchez-Sáez 4735bc5d47 [Misc] Add missing whitespace around '!=' operator 2016-03-22 18:43:59 +00:00
Ricardo Sánchez-Sáez 0e29f50f77 [ORKStepResult] Add 'enabledAssistiveTechnology' property
The property can have the following values:
 - `UIAccessibilityNotificationVoiceOverIdentifier` if Voice Over was active
 - `UIAccessibilityNotificationSwitchControlIdentifier` if Switch Control was active
2016-03-22 18:34:09 +00:00
Ricardo Sánchez-Sáez daac3505b4 [ORKSample] Small improvement to 40x40 app icon 2016-03-22 12:45:09 +00:00
Ricardo Sánchez-Sáez 89838d63bd [Misc] Update to Swift 2.2 code (Xcode 7.3 only)
(Avoid using newly deprecated methods)
2016-03-22 12:22:33 +00:00
Ricardo Sánchez-Sáez 1337dbf851 [ORKDirectionView] Avoid CGMutablePath leak 2016-03-22 12:15:24 +00:00
Ricardo Sánchez-Sáez 0c60532068 [ORKTextScaleAnswerFormat] Fix issue potentially causing 'nil' to try to be added to an array 2016-03-22 12:12:07 +00:00
Ricardo Sánchez-Sáez ea0fb64319 [ORKHealthKitCharacteristicTypeAnswerFormat] Expose 'defaultDate', 'minimumDate', 'maximumDate' and 'calendar'
Used to customize the presented date picker, only applicable to the 'HKCharacteristicTypeIdentifierDateOfBirth' characteristic type.
2016-03-21 18:50:27 +00:00
Ricardo Sánchez-Sáez 14bb563d26 [ORKPieChartView] Implement new ORKPieChartLegendCollectionViewLayout
It evenly distributes the cells between all the rows, and lays them out as compactly possible along the center by increasing leading and trailing padding.
2016-03-18 18:04:02 +00:00
Ricardo Sánchez-Sáez 09b7adc981 [Charts] Make scrubber to be shown on a static long press
Adds public UILongPressGestureRecognizer property.
2016-03-18 11:57:03 +00:00
Ricardo Sánchez-Sáez 412f30652f [Charts] Adjust reference line boundaries so they rest on full pixels on iPhone 6 and 6 Plus 2016-03-17 16:46:56 +00:00
Ricardo Sánchez-Sáez 9ef8b4a980 [Charts] Make sure ORKBarGraphChartView bars and ORKLineGraphChartView fill start at whole pixel coordinates 2016-03-17 15:47:20 +00:00
Ricardo Sánchez-Sáez ce365bbe10 [Charts] Make auto-calculated reduced-alpha colors opaque, so reference lines don't show below bar graphs 2016-03-16 21:15:15 +00:00
Ricardo Sánchez-Sáez 778bcf71e0 [ORKValueStack] Rename '-initWithStackedValueArray:' to '-initWithStackedValues:' and fix documentation 2016-03-16 18:05:15 +00:00
Ricardo Sánchez-Sáez bf94333d32 [ORKChartTypes] Make 'stackedValues' property to have copy semantics 2016-03-16 17:45:56 +00:00
Yuan Zhu 9f5caad71d Merge pull request #445 from rsanchezsaez/rsanchezsaez-HomogenousORKTextFieldView
[ORKTextField] Coherent placeholder handling
2016-03-16 10:07:20 -07:00
Ricardo Sánchez-Sáez 14fce4445f [Charts] Minor documentation improvements 2016-03-16 16:48:30 +00:00
Ricardo Sánchez-Sáez 1984b46efb [ORKNavigableOrderedTask] Add nullability annotations when returning individual rules; make sure the rule dictionary property always returns a proper non-mutable dictionary 2016-03-16 16:20:40 +00:00
Ricardo Sánchez-Sáez 02a822baef [Misc] Make sure -isEqual: method always uses the property format when accessing the variables to compare 2016-03-16 16:02:01 +00:00
Ricardo Sánchez-Sáez cdaa4d4c91 [Misc] Make sure +(instancetype)new is NS_UNAVAILABLE when init is so.
Also, throw exception on unavailable methods where appropriate. Make sure ORKTest unit tests continue to pass.
2016-03-16 15:55:09 +00:00
Ricardo Sánchez-Sáez 6e4a4560d8 [Misc] Use property syntax for accessing 'hash' 2016-03-16 14:04:46 +00:00
Ricardo Sánchez-Sáez 657bcab2f7 [Misc] Use 'error' instead of the non-standard 'err' abbreviation
(https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/CodingGuidelines/Articles/APIAbbreviations.html#//apple_ref/doc/uid/20001285-BCIHCGAE)
2016-03-16 13:34:41 +00:00
Ricardo Sánchez-Sáez b8a999995f [Misc] Remove explicit __autoreleasing annotation in indirect parameters to avoid noisy code
Indirect parameters are __autoreleasing implicitly: http://clang.llvm.org/docs/AutomaticReferenceCounting.html#indirect-parameters
Also, add _Nullable annotation to indirect parameters in headers, and homogenize whitespace surrounding it.
2016-03-16 13:31:50 +00:00
Ricardo Sánchez-Sáez 28ee60beb7 [Coding Style Guide] Add some whitespace notes, and favor '_Nullable' over '__nullable. 2016-03-16 13:21:02 +00:00
Ricardo Sánchez-Sáez e305e3c4b2 [ORKNavigationContainerView] Use explicit struct initialization 2016-03-16 13:17:03 +00:00
Ricardo Sánchez-Sáez 90f5a2cc62 [Misc] Avoid needless returns from void functions 2016-03-16 13:16:58 +00:00
Ricardo Sánchez-Sáez 75c75901a3 [Misc] Use __typeof instead of typeof
(Avoids pedantic warning)
2016-03-16 13:16:53 +00:00
Ricardo Sánchez-Sáez c5396e8ae6 [ORKHelpers] Remove needless struct casts 2016-03-16 13:16:46 +00:00
Ricardo Sánchez-Sáez 942a092bd1 [Misc] Remove extraneous ; symbols 2016-03-16 13:16:41 +00:00
Ricardo Sánchez-Sáez 1cb09d68d3 [Charts] Draw reference lines for Bar Graph Chart View on ORKCatalog example 2016-03-15 18:32:25 +00:00
Evan D. Schoenberg, M.D fd11ee1e89 Improved flexibility for laying out vertical ORKScaleSliderView. This allows longer text labels by setting constraints to allow the slider to move as far left as 25% the width of the view, and allows the text labels to expand to the edge of the view (less a SideLabelMargin margin width). 2016-03-15 13:32:19 -04:00
Ricardo Sánchez-Sáez 878acecad6 [ORKSpatialSpanTargetView] Remove needsless '_' prefix from static variable name 2016-03-15 17:07:20 +00:00
Ricardo Sánchez-Sáez 5d1fe51b42 [Coding Style Guide] Add 'Spaces in array and dictionary literals' subsection 2016-03-15 16:31:34 +00:00
Ricardo Sánchez-Sáez 077dfcc4ab [Misc] Additional whitespace homogenization regarding space before dictionary keys and around the tertiary operator (?:) 2016-03-15 16:09:19 +00:00
Ricardo Sánchez-Sáez f24c371541 [Misc] Rename STRONGTYPE() to ORKStrongTypeOf() and introduce ORKWeakTypeOf() for homogeneity 2016-03-15 15:31:26 +00:00
Ricardo Sánchez-Sáez 7a0101c12b [Project] Rename ORKDefines_Private.h to ORKHelpers_Private.h
(Since it has fuctions, not macros.)

Also, move localization functions from ORKHelpers_Private.h to ORKHelpers.h (the latter is an internal file, so encapsulation is better).
2016-03-15 14:54:55 +00:00
Ricardo Sánchez-Sáez 887f8dd6bd [Project] Extract type definitions from 'ORKDefines.h' into the new 'ORKTypes.h' file 2016-03-15 12:42:16 +00:00
Ricardo Sánchez-Sáez f6c8bc939b [ORKHelpers] Use ORK_INLINE macro 2016-03-15 12:14:44 +00:00
Ricardo Sánchez-Sáez b6cc2f3add [ORKGraphChartView] Use ORK_INLINE macro 2016-03-15 11:47:36 +00:00
Ricardo Sánchez-Sáez 24929ca8b1 [ORKHelpers] Rename STRINGIFY to ORK_STRINGIFY 2016-03-14 15:35:15 +00:00
Ricardo Sánchez-Sáez 8c270dca89 [ORKHelpers] Avoid using the reserved '__' prefix 2016-03-14 15:31:56 +00:00
Ricardo Sánchez-Sáez 129ee6baef [ORKKeychainWrapper]: Use '_Nullable' instead of '__nullable' (Xcode 7 style) 2016-03-14 15:23:26 +00:00
Ricardo Sánchez-Sáez a2e4b5aa1c [Misc] Always add space before '__autoreleasing' 2016-03-14 15:22:15 +00:00
Ricardo Sánchez-Sáez 75047cabb2 [ORKHolePegTest] Replace 'can not' by 'cannot' in exception messages 2016-03-14 15:09:58 +00:00
Ricardo Sánchez-Sáez 8a3fea6488 [Misc] Make some code to conform to code homogenization
- Remove space after unary '!' operator
- Remove space after pointer '*' start
2016-03-14 15:08:45 +00:00
Ricardo Sánchez-Sáez 57cbebae64 [ORKNavigableOrderedTask] Implement skip navigation rules
Introduce the ORKSkipStepNavigationRule and ORKPredicateSkipStepNavigationRule classes, and the appropriate 'ORKNavigableOrderedTask' methods to insert, view and remove them.
Implement ORKTest example code within the Navigable Loop Task Items.
Implement unit tests for the new functionality, and makes sure all serialization tests continue to pass.
2016-03-11 18:41:32 +00:00
Andrew Hill b13a470348 Merge branch 'ResearchKit/master' 2016-03-11 12:45:54 +00:00
Ricardo Sánchez-Sáez 2ea828e29e [ORKBarGraphChartView] Made BarWidth constant static 2016-03-11 11:56:08 +00:00
Ricardo Sánchez-Sáez 7efb9ecb36 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKBarGraphChart 2016-03-10 18:10:44 +00:00
Ricardo Sánchez-Sáez ea777873af [Charts] Make 'ORKValueRange' and 'ORKValueStack' to use 'double' instead of 'CGFloat' 2016-03-10 17:58:46 +00:00
Ricardo Sánchez-Sáez fc7c55c3ab [ORKValueRange] Raname 'isEmpty' property to 'isEmptyRange' 2016-03-10 17:24:13 +00:00
Ricardo Sánchez-Sáez df05877256 [Charts] Rename 'ORKFloatRange' and 'ORKFloatStack' to 'ORKValueRange' and 'ORKValueStack' 2016-03-10 17:20:13 +00:00
vtourraine 9025045a4c [Charts] Add sample graph chart data source for Interface Builder 2016-03-10 15:47:14 +01:00
vtourraine 0571b6e960 [Charts] Add sample pie chart data source for Interface Builder 2016-03-10 15:01:09 +01:00
Yuan Zhu d1fbc178a1 Merge pull request #591 from rsanchezsaez/rsanchezsaez-master-ORKSampleIcon
[ORKSample] Add app icon
2016-03-09 16:12:08 -08:00
Yuan Zhu 6a2f18af4d Merge pull request #629 from evands/vertical-slider-multiline
Allow 2 lines of text on vertical scale sliders
2016-03-09 16:10:45 -08:00
Yuan Zhu cc352493f9 Merge pull request #626 from weijentu/master
About ORKQuestionType for ORKTextAnswerFormat?
2016-03-09 11:00:42 -08:00
Yuan Zhu 43a4379c8e Merge pull request #621 from pra85/patch-1
[RELEASE-NOTES.md] Fix a typo
2016-03-09 10:30:43 -08:00
Evan D. Schoenberg, M.D 5c3db570f7 Allow unlimited lines for vertical scale slider views rather than 2 as per discussion in #629 2016-03-08 21:15:00 -05:00
Ricardo Sánchez-Sáez 0980410b95 [ORKFloatRange] Throw exception if 'maximumValue' is lower than 'minimumValue 2016-03-08 18:05:42 +00:00
Ricardo Sánchez-Sáez 2e5d784608 [ORKFloatStack] Add comma before the 'and' separator 2016-03-08 17:56:15 +00:00
Ricardo Sánchez-Sáez 288d710e51 [ORKGraphChartView] Fix issue with wrong UIAccessibilityIsVoiceOverRunning() check
The issue prevented accessibility elements to be properly set.
2016-03-08 17:49:21 +00:00
Ricardo Sánchez-Sáez cc46125c69 [ORKFloatStack] Implement accessibilityLabel method
(Used by Voice Over)
2016-03-08 17:48:37 +00:00
Ricardo Sánchez-Sáez ca94aa7468 [ORKChartTypes] Conform ORKFloatRange and ORKFloatStack descriptions to ObjC conventions 2016-03-08 17:46:09 +00:00
Ricardo Sánchez-Sáez d0293a0ee7 [ORKBarGraphChartView] Fix display animation implementation
Also, add ORKTest appearance tests, and make other graph tests more comprehensive by adding empty points at the middle.
2016-03-08 17:45:47 +00:00
Ricardo Sánchez-Sáez b8c80c70c7 [ORKBarGraphChartView] Implement most of bar graph chart functionality
Some details:
- Added ORKCatalog example and ORKTest test
- Conform ORKFloatRange and ORKFloatStack to the new ORKGraphChartType protocol. Move them to the ORKChartTypes.h/m files.
- ORKLineGraphChartView and ORKDiscreteGraphChartView now inherit from the abstract ORKFloatRangeGraphChartViewClass.
- There are now two concrete protocolsL ORKFloatRangeGraphChartViewDataSource (used by ORKLineGraphChartView and ORKDiscreteGraphChartView) and ORKFloatStackGraphChartViewDataSource (used by ORKBarGraphChartView). Both inherit from the abstract ORKGraphChartViewDataSource protocol.

Things yet to do:
- Implement appearing animations
- Implement ORKTest appearance-properties testing
- Implement and test bar chart view accessibility
2016-03-08 17:45:04 +00:00
Evan D. Schoenberg, M.D 40e328e29e Allow 2 lines of text on vertical scale sliders, as there is plenty of space for this to fit comfortably. 2016-03-05 09:51:20 -08:00
Ricardo Sánchez-Sáez 3f89fba2cf [Charts] Implement first steps for ORKBarGraphChartView
Also, makes ORKTest's 'ORKDiscreteGraphChartView' tests more comprehensive.
2016-03-01 17:14:55 +00:00
Ricardo Sánchez-Sáez bece29b351 [ORKGraphChartView] Fix global appearance proxy tintColor taking over custom local tintColor 2016-03-01 16:02:43 +00:00
Allen Tu 4d1601a787 Set questionType for ORKEmailAnswerFormat with ORKQuestionTypeText
Discussion: An ORKEmailAnswerFormat object is implied with
ORKTextAnswerFormat and produces an ORKTextQuestionResult object, too.
Could it be better to set its questionType to ORKQuestionTypeText?
2016-02-26 21:59:13 +08:00
Allen Tu 80d7685ab3 Merge remote-tracking branch 'ResearchKit/master' 2016-02-26 21:43:36 +08:00
vtourraine 6e1334a2fc Make chart and graph IBDesignable 2016-02-26 14:39:16 +01:00
vtourraine 3c550b54b4 Fix IBInspectable for readonly properties 2016-02-26 14:13:38 +01:00
vtourraine 7ca7079522 Make chart and graph properties IBInspectable 2016-02-26 10:49:19 +01:00
Prayag Verma e4af7fe7fe [RELEASE-NOTES.md] Fix a typo
Remove extra `the`
2016-02-18 13:07:24 +05:30
Jared Crawford 8c3b5ce81f Update delegate method documentation 2016-02-17 17:27:34 -08:00
Jared Crawford 783ad4c6b4 Adds support for drawing plots within a chart without individual data point indicators 2016-02-17 17:17:40 -08:00
Jared Crawford b85182b372 Fix typos 2016-02-12 12:27:58 -08:00
Jared Crawford 6e075cbfe3 Add a result predicate for determining if the user selected accept or decline in a consent signature step, allowing for custom navigation rules, such as skipping to the end of a survey if the user does not consent. 2016-02-11 18:07:08 -08:00
Yuan Zhu 410affbf5d Merge pull request #619 from rsanchezsaez/rsanchezsaez-UnitTests
[ORKNavigableOrderedTask] Fix 'shouldReportProgress' being ignored by NSSecureCoding and NSCopying
2016-02-08 15:34:57 -08:00
Ricardo Sánchez-Sáez 182960a263 [ORKGraphChartView] Fix small documentation issues 2016-02-08 18:24:51 +00:00
Ricardo Sánchez-Sáez 0971ef71f4 [ORKSample] Fix typos in variable names 2016-02-08 17:52:46 +00:00
Ricardo Sánchez-Sáez 92ca8f86a5 [ORKGraphChartView] Fix error in accessibility string key 2016-02-08 17:50:45 +00:00
Ricardo Sánchez-Sáez 24c46898e8 [ORKLineGraphChartView] Go back to consistently using minimumValue as main plotted data 2016-02-08 16:40:34 +00:00
Ricardo Sánchez-Sáez 065a02eff1 [ORKNavigableOrderedTask] Fix 'shouldReportProgress' being ignored by NSSecureCoding and NSCopying
Also, fix ORKTest's unit tests.
2016-02-08 16:33:22 +00:00
Ricardo Sánchez-Sáez 2db99d6152 [Charts] Rename ORKRangedPoint to ORKFloatRange
Also:
- Improve documentation.
- Fix ORKFloatRange's 'hasEmptyRange' property being always 'NO'.
- Fix typo in ORKGraphChartView's 'colorForPlotIndex:' method.
2016-02-08 16:24:33 +00:00
Ricardo Sánchez-Sáez f6cb8b09f0 [ORKGraphChartView] Make the discrete graph to snap on the actual chosen plot index when scrubbing 2016-02-07 18:51:06 +00:00
Ricardo Sánchez-Sáez f9d49594fe [ORKGraphVhartView] Fix scrubber not being correctly positioned for last data point in discrete graphs 2016-02-07 15:41:07 +00:00
Yuan Zhu 62a31b087a Merge pull request #618 from rsanchezsaez/rsanchezsaez-ReleaseNotes
[RELEASE-NOTES.md] Improvements
2016-02-05 12:27:31 -08:00
Ricardo Sánchez-Sáez 70fd57488d [RELEASE-NOTES.md] Fix some typos, rewrite some sentences and improve formatting 2016-02-05 18:29:06 +00:00
Yuan Zhu 1f457e1d54 Merge pull request #615 from apbendi/nav-ordered-progress
Allow user to opt-in to linear progress reporting on ORKNavigableOrderedTask
2016-02-03 10:21:30 -08:00
Ben DiFrancesco 729247cfcd Allow user to opt-in to linear progress reporting on ORKNavigableOrderedTask 2016-01-29 10:50:25 -05:00
Yuan Zhu 218b8af66a Merge pull request #604 from rsanchezsaez/rsanchezsaez-ORKTestTests
[ORKTestTests] Fix unit tests
2016-01-27 14:21:42 -08:00
Ricardo Sánchez-Sáez 069c388cb3 [ORKTest] Remove README.md from target 2016-01-27 19:34:13 +00:00
Ricardo Sánchez-Sáez e199db13b4 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKTestTests 2016-01-27 19:30:50 +00:00
Ricardo Sánchez-Sáez a96c8b9540 [ResearchKit] Fix unit tests
- Fixes tests to reflect the new empty answer for a Choice Answer Format being ORKNullAnswerValue() instead of an empty array (introduced on the Review Step feature).
- Fixes test for task step identifier uniqueness validation (it now takes place on task init).
2016-01-27 13:21:05 +00:00
Ricardo Sánchez-Sáez 865275d3aa [Projects] Fix ResearchKit framework linkage for all 3 apps
This links and embeds the workspace instance of ResearchKit from the three subprojects.

Also:
- Remove ResearchKit subproject reference from ORKCatalog.
- Link HealthKit framework from ORKSample.
- Link HealthKit and MapKit in an optional way.
- Reorganise frameworks into Framework group for each subproject.
2016-01-27 12:39:55 +00:00
Yuan Zhu a1d29fe225 Merge pull request #612 from CareEvolution/ORKWaitStepView-header-fix
Revert ORKWaitStepView.h to Project visibility
2016-01-26 11:32:03 -08:00
Scott Guelich 67bcc93947 Remove Private attribute from internal headers 2016-01-26 11:29:18 -08:00
Yuan Zhu 8e8fabf79f Merge pull request #605 from rsanchezsaez/rsanchezsaez-ORKStepNavigationRule
[ORKStepNavigationRule] Improve documentation
2016-01-26 11:27:30 -08:00
Yuan Zhu 292727ad91 Merge pull request #611 from CareEvolution/remove-chart-no-data-label
ORKGraphChartView - Remove the "No Data" label when there is data
2016-01-26 10:46:57 -08:00
Scott Guelich 2f1e58e234 Revert ORKWaitStepView.h to Project visibility 2016-01-26 08:47:41 -08:00
Scott Guelich 86226e9ba8 Remove noDataLabel when no data
Fix simple logic error
2016-01-26 08:37:13 -08:00
Yuan Zhu d40e8193d5 Providing a scale factor property in ORKPieChartView.
One reasoning this might be needed is incase the labels in the pie chart don't fit.
2016-01-22 13:39:59 -08:00
Yuan Zhu 525f2c6efb Merge branch 'master' of https://github.com/ResearchKit/ResearchKit 2016-01-22 13:20:39 -08:00
Oliver Schäfer a4777c8a42 Merge remote-tracking branch 'apple/master' 2016-01-17 11:34:26 +01:00
Ricardo Sánchez-Sáez ad52da287c [ORKStepNavigationRule] Improve documentation
- Improve whitespace
- Specify that passing 'ORKNullStepIdentifier' (instead of 'nil') ends the task for direct and predicate step navigation rules.
2016-01-16 21:46:18 +00:00
Ricardo Sánchez-Sáez 8d0fd95ad0 [ORKTestTests] Fix failing tests (mainly due ORKReviewStep) 2016-01-16 21:36:55 +00:00
Ricardo Sánchez-Sáez 46c78c08a4 [Workspace] Remove duplicated ResearchKit subproject references from ORKSample and ORKTest
They're not needed since ResearchKit is already in the Workspace.
2016-01-16 21:35:53 +00:00
Yuan Zhu 54927408bf Merge pull request #601 from rsanchezsaez/rsanchezsaez-ORKSample
[ORKSample] Allow onboarding to proceed on the Simulator despite HealthKit not being present
2016-01-14 16:27:36 -08:00
Yuan Zhu f325310d77 Merge pull request #451 from rsanchezsaez/rsanchezsaez-documentationformatting
README.md formatting
2016-01-14 16:11:13 -08:00
Yuan Zhu dd4e4fdbce Merge pull request #596 from shazino/timed-walk-optional-form
Add includeAssistiveDeviceForm parameter to timed walk task
2016-01-14 16:00:33 -08:00
Yuan Zhu 063cde7656 Merge pull request #602 from rsanchezsaez/rsanchezsaez-ORKGraphChartView
[Charts] Fix crash when displaying graph chart with no data source
2016-01-14 15:53:48 -08:00
Ricardo Sánchez-Sáez fb1ef39165 [Charts] Add reloadData methods
The developer can call this method if the data provided by the dataSource changes.
2016-01-14 22:26:59 +00:00
Ricardo Sánchez-Sáez c570771b4d [ORKGraphChartView] Avoid crash when displaying a graph with no dataSource set 2016-01-14 21:55:50 +00:00
Ricardo Sánchez-Sáez 00ff2f3402 [ORKSample] Allow onboarding to proceed on the Simulator despite the lack of HealthKit 2016-01-14 21:15:59 +00:00
Ricardo Sánchez-Sáez 407de8ed11 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-HomogeneousORKTextFieldView 2016-01-14 20:59:10 +00:00
Ricardo Sánchez-Sáez 6474ebfff7 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-documentationformatting
# Conflicts:
#	ResearchKit/ActiveTasks/ORKTowerOfHanoiStep.h
#	ResearchKit/Common/ORKAnswerFormat_Private.h
2016-01-14 20:57:48 +00:00
Yuan Zhu 340ba7210d Merge branch 'master' of gitlab.sd.apple.com:y_zhu/GitHub-ResearchKit-Fork into convergence_regex_api_change 2016-01-14 10:29:03 -08:00
Yuan Zhu 8c86b8d80d Merge pull request #463 from oliverschaefer/master
Review Step: API Design v1.2
2016-01-13 17:14:58 -08:00
Oliver Schäfer 7ceda4a9c3 PR updates 2016-01-12 17:23:12 +01:00
Oliver Schäfer 21c89256fa Merge remote-tracking branch 'apple/master' 2016-01-12 17:19:49 +01:00
Pascal Pfiffner 62ae57bb11 Merge branch 'master' into feature/passcode-override 2016-01-12 14:20:38 +01:00
Yuan Zhu fbc4191081 Merge pull request #599 from ResearchKit/stable
Merge `Stable` into `Master`
2016-01-11 15:50:58 -08:00
Yuan Zhu 674e06cebc Merge pull request #597 from evliu/master
Samples - ORKCatalog/Charts/ChartListViewController - set prop on dis…
2016-01-08 13:17:32 -08:00
Everest Liu ade7f99010 Samples - ORKCatalog/Charts/ChartListViewController - set prop on discreteGraphChartView instead of lineGraphChartView 2016-01-07 13:29:27 -08:00
vtourraine 94fbd3a6d1 Add includeAssistiveDeviceForm parameter to timed walk task
Make timed walk assistive device form items non-optional
2016-01-06 16:47:31 +01:00
Oliver Schäfer f24a74006a PR updates 2016-01-06 13:27:38 +01:00
Oliver Schäfer 040b9d2220 Merge remote-tracking branch 'apple/master' 2016-01-06 13:18:34 +01:00
Oliver Schäfer 2e1749a14d alert controller bugfixes 2016-01-06 13:09:30 +01:00
Yuan Zhu 204d5dbf40 Merge pull request #595 from rsanchezsaez/rsanchezsaez-ORKOrderedTask
[ORKOrderedTask] Validate step identifier uniqueness on init
2016-01-05 16:17:59 -08:00
Yuan Zhu 908b9cb713 Merge pull request #593 from rsanchezsaez/rsanchezsaez-ORKGraphChartView
[ORKGraphChartView] Fix wrong selector check on accessibility
2016-01-05 16:14:23 -08:00
Yuan Zhu ff2c5ad055 Merge pull request #592 from rsanchezsaez/rsanchezsaez-ORKChoiceAnswerFormatHelper
[ORKChoiceAnswerFormatHelper] Relax class checking so choice answer formats can be subclassed
2016-01-05 15:47:05 -08:00
Oliver Schäfer 66fa232ca7 PR updates 2016-01-05 17:09:44 +01:00
Pascal Pfiffner 75ad7512b8 Merge branch 'master' of github.com:ResearchKit/ResearchKit 2016-01-05 10:46:51 +01:00
Ricardo Sánchez-Sáez 8b521477dd [docs] Fix some headerdoc warnings 2016-01-05 03:05:42 +00:00
Ricardo Sánchez-Sáez d60c81b004 [docs] Remove extraneous line from the Programming Guide 2016-01-05 02:52:22 +00:00
Ricardo Sánchez-Sáez a44f2db8fd [ORKOrderedTask] Validate step identifier uniqueness on init 2016-01-05 02:32:56 +00:00
Ricardo Sánchez-Sáez 58d377d9ab [ORKGraphChartView] Fix wrong selector check on accessibility 2016-01-05 02:24:52 +00:00
Ricardo Sánchez-Sáez e56bf7d217 [ORKChoiceAnswerFormatHelper] Relax class checking so choice answer formats can be subclassed 2016-01-05 01:49:17 +00:00
Ricardo Sánchez-Sáez 28ff1415dd Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-documentationformatting
# Conflicts:
#	README.md
2016-01-05 00:19:28 +00:00
Ricardo Sánchez-Sáez 8cbe836bb2 ORKTextFieldView: proper fix for animation glitch
The text frame sometimes animated from left to right (e.g., in ORKTest's MiniForm, tap 4th text field, type any number and tap any other text field).
Also remove needless period on latest placeholder text.
2016-01-05 00:14:49 +00:00
Ricardo Sánchez-Sáez 2289abf03a ORKFormItemTextFieldBasedCell: Allow temporarily leaving the text field empty without triggering answer validity checking
This fixes a regression. It restores the behavior in which you are allowed to edit a different text field in a form if you leave the current text field blank. E.g., on ORKTest's 'Mini Form', tapping on the first cell text field and then tapping on second cell text field without having written anything should not trigger the alert.
2016-01-04 23:09:35 +00:00
Ricardo Sánchez-Sáez 44ee48fa54 ORKTextField: Hide placeholder when editing a field which has a suffix 2016-01-04 23:00:18 +00:00
Ricardo Sánchez-Sáez b704be75b5 ORKAnswerTextView: fix comment typo 2016-01-04 22:30:54 +00:00
Ricardo Sánchez-Sáez 4048e34530 ORKAnswerTextFieldView: fix whitespace 2016-01-04 22:30:13 +00:00
Ricardo Sánchez-Sáez b34fb01350 ORKAnswerTextView: use the same placeholder approach as in ORKTextFieldView
This creates a non-interactive 'UITextView' for displaying the placeholder at the exact same position as the 'ORKAnswerTextView' text.

It improves encapsulation, the 'ORKAnswerTextView' class handles the placeholder internally.

Also: some minor naming convention improvenets in 'ORKTextFieldView'.
2016-01-04 22:30:09 +00:00
Ricardo Sánchez-Sáez 1b266c3652 ORKTextFieldView: conform to naming and whitespacing conventions 2016-01-04 22:23:58 +00:00
Ricardo Sánchez-Sáez 8ab052577d ORKTextFieldView: fix active unit color being off when there's no placeholder 2016-01-04 21:58:51 +00:00
Ricardo Sánchez-Sáez 1e34cf6d35 ORKTextFieldView: fix unit frame animation glitch
To reproduce, tap on an empty field with unit label and no placeholder (first form item of first step in ORKTest's Miniform).
2016-01-04 21:58:35 +00:00
Ricardo Sánchez-Sáez d39a72e535 ORKTextField: reduce left paddingGuess 2016-01-04 21:58:13 +00:00
Ricardo Sánchez-Sáez 135e2209c8 ORKTextFieldView: whitespace 2016-01-04 21:58:07 +00:00
Ricardo Sánchez-Sáez b865da3a75 ORKTextFieldView: make placeholder behave like 'UITextFieldView' placeholder
# Conflicts:
#	ResearchKit/Common/ORKTextFieldView.m
2016-01-04 21:57:53 +00:00
Ricardo SaÃÅnchez-SaÃÅez 40111a1431 ORKTextFieldView: remove '_unitWithPlaceholder' ivar which was producing extra unneeded padding between the placeholder and the unit 2016-01-04 21:55:34 +00:00
Ricardo Sánchez-Sáez cc45d92266 [ORKSample] Add app icon 2016-01-04 20:00:33 +00:00
Oliver Schäfer 1619428bb0 Accessibility updates 2015-12-29 22:07:22 +01:00
Oliver Schäfer 3ae773049a PR updates 2015-12-29 12:20:54 +01:00
Oliver Schäfer 76eb4f97d9 Merge remote-tracking branch 'apple/master' 2015-12-28 17:45:52 +01:00
Pascal Pfiffner 12326634db Spaces instead of tabs 2015-12-23 17:30:06 +01:00
Pascal Pfiffner 36b90b813c Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into feature/passcode-override 2015-12-23 17:28:41 +01:00
Yuan Zhu 22b769b786 Merge pull request #588 from YuanZhu-apple/convergence_merge_master
Merge convergence code into master
2015-12-22 14:21:49 -08:00
Yuan Zhu 0afc2027d7 Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into convergence
Conflicts:
	samples/ORKCatalog/ORKCatalog/Results/ResultTableViewProviders.swift
2015-12-22 14:09:54 -08:00
Pascal Pfiffner a78878c712 Allow to enforce a certain passcode
Comes in handy when moving to ResearchKit's passcode entry from a custom implementation or AppCore.
2015-12-18 11:21:04 +01:00
Pascal Pfiffner f6fd29087b Use instancetype instead of id 2015-12-18 10:48:32 +01:00
Pascal Pfiffner 4517cd445e Merge branch 'master' of github.com:ResearchKit/ResearchKit 2015-12-18 09:38:50 +01:00
Andrew Hill d151e11004 Merge branch 'ResearchKit/master' 2015-12-17 23:23:09 +00:00
Yuan Zhu ec9b1c9108 Change regex api to accept NSRegularExpression. 2015-12-16 15:56:28 -08:00
Yuan Zhu d7bf7a6ec3 Merge pull request #581 from Sage-Bionetworks/master-sage
Added method to create a copy of a step with a new identifier
2015-12-16 10:03:20 -08:00
Shannon Young 4342caae71 Updated in response to code review. 2015-12-15 18:10:26 -08:00
Shannon Young f7d7355c49 Added method to create a copy of a step with a new identifier 2015-12-15 14:48:38 -08:00
Oliver Schäfer 610ce5aefd Merge remote-tracking branch 'apple/master' 2015-12-08 22:01:56 +01:00
Oliver Schäfer bd52a14196 Minor PR updates 2015-12-08 22:01:44 +01:00
Pascal Pfiffner 423a89c879 Merge branch 'master' of github.com:ResearchKit/ResearchKit 2015-12-07 16:51:07 -05:00
Oliver Schäfer e444086399 PR updates 2015-12-06 13:13:33 +01:00
Oliver Schäfer 0ed1df3945 PR changes 2015-12-04 13:36:38 +01:00
Oliver Schäfer d71ab9538c PR updates 2015-12-03 22:08:37 +01:00
Oliver Schäfer 7caaf525e3 PR updates 2015-12-03 13:05:22 +01:00
Yuan Zhu c3102d6183 Merge branch 'convergence' 2015-12-01 15:31:04 -08:00
Oliver Schäfer 73495244be PR change 2015-11-30 21:31:52 +01:00
Yuan Zhu 85dd559217 Merge pull request #575 from UberJason/master
Fixed build error in ResultTableViewProviders.swift caused by an outdated property.
2015-11-30 10:44:03 -08:00
Jason Ji 81c8c10ebc Fixed build error in ResultTableViewProviders.swift caused by an outdated property. 2015-11-24 20:12:48 -05:00
Yuan Zhu 63a7e30049 Merge pull request #573 from tomihisaw/master
Allow ORKLoginStepViewController to be subclassed by making the class…
2015-11-23 14:23:47 -08:00
Tom Welsh 8fa839a66b Allow ORKLoginStepViewController to be subclassed by making the class symbol visible 2015-11-23 14:02:47 -05:00
Ryan J. Liljestrom 24a03d6ecf Expose NSRegularExpressionOptions for ORKTextAnswerFormat and via a transparent property in ORKRegistrationStep 2015-11-20 14:31:11 -05:00
Oliver Schäfer f8a77a1b1e Read only message 2015-11-19 20:24:11 +01:00
Oliver Schäfer ddc0016bd1 Disable skip button 2015-11-19 20:00:57 +01:00
Oliver Schäfer 8b81a8c5f1 Merge remote-tracking branch 'apple/master' 2015-11-18 22:55:22 +01:00
Oliver Schäfer ff673f0ad4 Fixed header comment typos 2015-11-18 22:50:03 +01:00
Oliver Schäfer 116a8e08ad Changed animation direction 2015-11-18 22:40:24 +01:00
Yuan Zhu 09e717c69f Merge pull request #564 from md0u80c9/CorrectDestionation
CorrectDestionation
2015-11-18 10:34:49 -08:00
Oliver Schäfer 9b1bdd390c PR changes, added documentation 2015-11-18 15:28:23 +01:00
Oliver Schäfer b113ef0ee3 PR updates 2015-11-17 21:52:23 +01:00
Andrew Hill 8e49cbc733 Correct Destionation
Changed all instances of Destionation to Destination
2015-11-17 13:47:25 +00:00
Andrew Hill 37cfadf81a Merge branch 'ResearchKit/master' 2015-11-16 22:29:18 +00:00
Oliver Schäfer fb778eefcf Bug fix 2015-11-13 09:41:25 +01:00
Oliver Schäfer f384f9137d Bug fixes 2015-11-12 22:24:12 +01:00
Oliver Schäfer 2f19a3e089 PR updates, bug fix 2015-11-12 21:44:04 +01:00
Oliver Schäfer b112945365 PR update 2015-11-11 21:13:38 +01:00
Oliver Schäfer 58c12a025b Changed review step ui for better navigation 2015-11-11 18:56:31 +01:00
Oliver Schäfer 2aa09084c8 PR updates 2015-11-06 22:16:43 +01:00
Oliver Schäfer 4d16e39f73 Merge remote-tracking branch 'apple/master' 2015-11-06 21:21:13 +01:00
Oliver Schäfer 59d2ed7a39 PR updates 2015-11-04 21:54:53 +01:00
Oliver Schäfer e5a4d01039 Merge remote-tracking branch 'apple/master' 2015-11-04 05:45:38 +01:00
Oliver Schäfer e7aac14571 PR update to fix ORKTextScaleAnswerFormat crash and re-connect embedded and standalone review step in ORKTest 2015-11-04 05:41:11 +01:00
Oliver Schäfer 746b0866b0 PR changes related to displaying results 2015-11-03 22:23:27 +01:00
Andrew Hill 11a29435cd Merge branch 'ResearchKit/master' 2015-11-01 09:01:21 +00:00
Oliver Sch√§fer 00886afe69 Displaying results for ORKLocationAnswerFormat 2015-10-26 17:53:24 +01:00
Oliver Schäfer fdd608fee4 Merge remote-tracking branch 'apple/master' 2015-10-26 17:30:54 +01:00
Andrew Hill b630dff27e Merge branch 'ResearchKit/master' 2015-10-25 20:28:57 +00:00
Oliver Sch√§fer c41fac8023 Displaying results 2015-10-25 18:27:34 +01:00
Andrew Hill 2819b7714d Merge branch 'ResearchKit/master' 2015-10-22 07:55:27 +01:00
Oliver Schäfer 81ec1f0056 Merge remote-tracking branch 'apple/master' 2015-10-22 00:10:02 +02:00
Oliver Sch√§fer 36f710739d PR updates 2015-10-22 00:05:11 +02:00
Oliver Sch√§fer 04f5a9e9f6 PR changes 2015-10-21 20:14:18 +02:00
Andrew Hill aa2e83e2b5 Merge branch 'ResearchKit/master' 2015-10-20 19:09:40 +01:00
Andrew Hill 79deaaa4b2 Merge branch 'ResearchKit/master' 2015-10-19 19:11:34 +01:00
Oliver Sch√§fer a581d58243 Bug fixes 2015-10-17 16:44:59 +02:00
Oliver Sch√§fer 718a4d3ed7 PR changes 2015-10-17 12:49:24 +02:00
Oliver Sch√§fer 9241848bc3 PR changes 2015-10-17 11:09:35 +02:00
Oliver Sch√§fer 913be47d6d Fixed corruption of project.pbxproj 2015-10-17 11:00:46 +02:00
Oliver Sch√§fer 88a94e106b PR Changes 2015-10-17 10:47:17 +02:00
Oliver Schäfer 2469bfe5a3 Merge remote-tracking branch 'apple/master' 2015-10-17 10:45:19 +02:00
Oliver Sch√§fer 6ec5df751d PR changes 2015-10-17 10:40:14 +02:00
Oliver Sch√§fer 7ef55e55e7 Bug fux 2015-10-16 21:51:00 +02:00
Oliver Sch√§fer 41d6a415ad Bug fixes 2015-10-12 11:59:10 +02:00
Oliver Sch√§fer a3b2d68b7a State restoration bugfix #2 2015-10-11 12:43:52 +02:00
Oliver Sch√§fer 87560025c8 State restoration bugfix 2015-10-11 12:34:08 +02:00
Oliver Sch√§fer dc3c6e011c PR changes 2015-10-08 20:47:55 +02:00
Oliver Schäfer 0180500607 Merge remote-tracking branch 'apple/master' 2015-10-03 12:02:33 +02:00
Oliver Sch√§fer 42e6c97ee2 API changes 2015-10-03 12:02:18 +02:00
Oliver Sch√§fer ce6c79a60f Minor changes 2015-10-01 23:01:54 +02:00
Oliver Sch√§fer 86bcdaa3ee Minor changes 2015-10-01 22:57:32 +02:00
Oliver Schäfer 6d2c1400b1 Merge remote-tracking branch 'apple/master' 2015-10-01 17:02:45 +02:00
Oliver Sch√§fer 8fa8dbae9e Changed progress label appearance when reviewing a step 2015-10-01 16:50:10 +02:00
Ricardo Sánchez-Sáez d26712e5a1 README.md: add 'Charts' section
Also add information about the chart examples in ORKCatalog.
2015-09-30 01:23:22 +01:00
Ricardo Sánchez-Sáez 0eba3970b5 README.md and Programming Guide: fix minor formatting issues 2015-09-30 01:20:42 +01:00
Ricardo Sánchez-Sáez 20e9cb24d4 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-documentationformatting
# Conflicts:
#	docs/Overview/GuideOverview-template.markdown
2015-09-29 22:37:51 +01:00
Oliver Sch√§fer 29f883b04b Refactored for ResearchKit 1.2 Compatibility 2015-09-20 09:12:01 +02:00
Pascal Pfiffner 870a9f6ac5 Merge branch 'master' of https://github.com/ResearchKit/ResearchKit 2015-09-17 13:10:03 +02:00
Ricardo Sánchez-Sáez 30a346e94d Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-documentationformatting 2015-09-17 01:45:30 +01:00
Ricardo Sánchez-Sáez 7361442a04 Programming Guide: add formatting for keywords and hard-wrap at line 100 2015-09-11 00:03:54 +01:00
Ricardo Sánchez-Sáez 398ae8029f README.md: add formatting to keywords such 'ResearchKit framework', 'iOS', 'Xcode', etc.
Also: hard-wrap documentation at line 100.
2015-09-10 23:58:38 +01:00
Pascal Pfiffner 1c0ac116d1 Backport slider fixes for Xcode 6 2015-08-30 23:36:52 +01:00
Allen Tu 1ecf1d7027 Merge remote-tracking branch 'ResearchKit/master' 2015-07-08 13:20:44 -07:00
2309 changed files with 148615 additions and 49900 deletions
+1
View File
@@ -0,0 +1 @@
LFS-Files/** filter=lfs diff=lfs merge=lfs -text
+26
View File
@@ -0,0 +1,26 @@
name: Build
on:
push:
branches: [ 'main', 'stable' ]
pull_request:
branches: [ 'main', 'stable' ]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
test:
runs-on: macos-14
strategy:
matrix:
destination: ['platform=iOS\ Simulator,OS=17.4,name=iPhone\ 15\ Pro']
scheme: ['ResearchKit']
name: ${{ matrix.scheme }} Unit Tests
steps:
- uses: actions/checkout@v4
- name: Set Xcode Version
run: sudo xcode-select -s /Applications/Xcode_15.3.app
- name: Test
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -verbose -workspace RKWorkspace.xcworkspace -scheme ${{ matrix.scheme }} -destination ${{ matrix.destination }} build test | xcpretty
+2
View File
@@ -0,0 +1,2 @@
[lfs]
fetchexclude = *
+16 -19
View File
@@ -6,7 +6,7 @@ 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.
on the [*ResearchKit* Forum](https://developer.apple.com/forums/tags/researchkit) or [contact us](mailto:researchkit@apple.com) for guidance.
Contributing software
@@ -16,8 +16,7 @@ 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)
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:
@@ -27,7 +26,7 @@ To contribute to ResearchKit:
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.
7. Once accepted, your pull request will be merged into main.
Choosing an issue to work on<a name="create"></a>
----------------------------
@@ -36,13 +35,12 @@ 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
* Improving the APIs needed to get started with a ResearchKit project
* New Active Tasks
* Data analysis for Active Tasks
* Backend integrations
If in doubt, bring your idea up on [researchkit-dev](https://lists.apple.com/mailman/listinfo/researchkit-dev).
If in doubt, bring your idea up on the [ResearchKit Forum](https://developer.apple.com/forums/tags/researchkit).
Creating a personal fork<a name="fork"></a>
@@ -56,8 +54,7 @@ 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).
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
@@ -78,7 +75,7 @@ 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)
audit your components with VoiceOver (or other relevant assistive technologies)
enabled.
Keep changes that fix different issues separate. For bug fixes,
@@ -99,11 +96,11 @@ 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).
* Multiple device form factors (for instance, iPhone SE, iPhone 14, iPhone 15 Pro, iPhone 15 Pro Max).
* 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
You can use the `ORKCatalog` app in the `samples` directory to
test your changes.
Submit a pull request<a name="request"></a>
@@ -120,7 +117,7 @@ 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
to main. You are still responsible for your change after it is
accepted. Stay in contact, in case bugs are detected that may require
your attention.
@@ -134,7 +131,7 @@ documentation, or other issues during this process.
Release process
-----------------
The `master` branch is used for work in progress. On `master`:
The `main` branch is used for work in progress. On `main`:
* All test apps should build and run error free.
* Unit tests should all pass.
@@ -142,9 +139,9 @@ The `master` branch is used for work in progress. On `master`:
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,
will branch from `main` 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:
`main`. On the convergence branch, changes will be made only to:
* Fix high priority issues.
* Update documentation.
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de038a3a1edef4a623f73c86cac9a923576110c48eb14be95c8b45e2aae0b4c3
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:514a1e443c6ab82dfb661fdcfc4bb99c208ae281b99c65f10fb3fcc9c68440c8
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b19773cdb76254a14bac6fe3785daa499cd82138c49d984208fc8dbb7a3c7176
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6fd2f0a91950d3eb205401904ec916759e48d8fd0fb0b57c5eee4e1448c48d3d
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f4e12c8bf5f28b58c7a0a6276106d2eb00e3cbca7e76c9f6c3da130ba1ffec25
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5bf50bbdaeb00237b7fdb8558fb4e0f52a210a0279859d93582218c38bfea76f
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cd7f19b0a9fea7112ecd8a33a63b57f9ef8fb98d26f676127aeef445d39394b
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0699d19584d85f6abdac232e62d77c3052bd506105600efe89d945e139f38f14
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:206157163ec5231820f99d937ceb7be0430ca7a2886184945cb20c178a36b8cb
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c38da877423ee3bf3c9d4e4c592b45ad8286ea825ddfaa5984f3b38f76af19c5
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c4e493991a79d32f143525533aa9b38be85f16545ca60012360382ed011fe8b
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b934cbe35567329c71a4e363d468986bb49d17108fdb5fecd180f626f16551a0
size 384104
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7e0a296d18275b17c9425b8b297dead312dbcee753e7585f8a5c8886b35f03f
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3559ebee58cf65deefb5550b0a4bbe36fad59419c23f7f416641389fc7cb02d
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8587d3ab758a38125a2f63edb48307ed1f95b5c7277e87335f47412b9bf8f28e
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f0f753994b92a3b542af0e520ac41b451af18bc04e5577b984701eea2ebfb03
size 384094
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1ef9361e4136dbc4c800bb2b91e43e17afb9a4a3280cf775c664c65411eaf7a0
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d610a10cfc62539e88685a84db74cba30e724d04e9454843f9bda53a2e2e057
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:55f02f5537212111ce403e69ce0552a7391ea156ff631e39be0492f322a4c1b5
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d328b748b2ad10fccd9b8fbac33df789e74ca8e8e24133e243fae7ac197d3927
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c54cf37051e60ed20680cc344b65365376377b1b023e5ca6c792321f58790a38
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:98a4b2ec9bb289d69fa069bcdd1484279baf474b8ca6a6f64c2d5b7568b6ac81
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df4e1c9aa1a413e573203ad27f089134ff67035b91bf47ec8ad2041df79915f8
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba4986d47ff2c6b252d768a40838e11af7f7949c515ea7409e5a566edfa34ad4
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:691dc4575d2723a6ac9800e1069f93187572d7606c11ccb6042f490656ed1cd6
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea3aa71d881c978ceb8a4b63375fede5ca66d4e4e580d4ce508ddb4b6917b4ce
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02220bd29a1ff17d11c35fa887af2be987155c028572d1bdbd94d09056056651
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e2f5ff119d235885b5bc5e81d399128696c8a43beeff95fee17eaca7a12fb42
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ba494a8404b44a4c14aeef5eb7d54d86821273f54c5b7561fcd7e62a5cce539
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e5e734f46bcd9e78d5c39b5e4e5a6c92cfc6a26a50e4afa78f48366c53340b0
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ce6e70c06749d8c1810fa6c91dfadef1e43caebb7950a505719a9177988d1bf
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94df3c9a734608fbd171a218492c0037f0d79f8e49dd740d52b7b512ae77c76f
size 384092
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:85e603aa991d94e385b7beb46c237f68fac969201f7abcf419532031edf281a9
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c46d33067569bd661c3233873e386dd7fe8da92223cc01396362c07502bdcf3
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:607353d00854f82db7bfdac7622f624ed27844cf9934aa81654c019bed2b9870
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa6e44907521dc2284313b2eaf3a8810f60c2c8d6c336ce07cb4bf26afb6924e
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:239fe86d3f1c1b2304c2fd1ab657fc63a9f9ee7c51da25c28b8fa6d1d850f76b
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48f09d32946144b110716bf332973fc143b771348baabc5f9f210abc640ecdb5
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6d37a9439f1c569802e3e9c9c1bb2ab2cfb3f7d89a682c7e33487ff0e551b9ca
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b03685ea30a12603b68433300e6b01d922a40b7532e7b9d58f4c54b7d0ee540e
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:caddc9f717e9ef1a823bc337696ba0d6e08ceeeac432803ed496e2c96d6a7b79
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21df4b311baa53083fb7c8c4974578505a7cdac229988bd15be942141473a595
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:944f1a5e2f56aaced7973b451814be9978d5df818be311d0797edc3a8da5f256
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f910b1050340e427fac2ea2e2589323aad1d14ff60fe4e0d3ef27cdcf9deed56
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ae3796fbc0da3e5c6f39da5aa9485980edd850189656fc405dfff8a3b0abdc6
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a41e38cb7d8a76f6a432cd5b3117cb2342c9439ca95b976fb6ca900e3a8cab4
size 384104
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:781c6fb457c166d1c198ca7987c205b25f2f5ee29bf69c1b05918da4403476dc
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9da05dfbc76881a75a4d6daed07a54ad1a933f62f1fb1784a37afa1a6908c814
size 384106
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a27dbf6d7050b2e7acd861aedc37e58049a0f4594be1bcb31a55206ee5708f7
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:928fea52270b9fd025235b1596881ecdb74e385797fd1dfa7db6ca201de75e6e
size 384094
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6dc904274ac7fb7783dc2271070cda10b33395bff4470eff9fdf6b85e1e124d8
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d464454a24719fe8c92abed64c5e8964ed04f39671f697a2d6af3f09c76d1ca
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:270a0a40d3181d9b57ff0b0dc6c1876f0a752e1ab2b9e28548f99f39a046a719
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a128b7bbb924947355ef2069096d4282e786830073584c39ab5d7291f80ab43
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f2044ee1217ab87446a21ba1b9ac2c1471b7f617b4fb205fb7526e3db1b97ce
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b03ef6b114c5d14148793026bcf0fa6738dff5276ddb03e5e4d5e7cc8ef1200
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:836a6a8cacda6cb6d99e09bb910e945859db624a39aa7a12ff15b9ea1da23329
size 384094
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:424f7c8164ebba6334053af79bc6f74da0be544d4da35d48dae44b91b9039d59
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4892b512d217fd0d9cacb05acc068557681236b2bf1a8e15197aa5b33dbce680
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0310f0c6cb75e20b25573a361e6a230c0e30ff74a41aca535f49afb4f69030ae
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29a3c39c6521ef12c74738e6471af20d842a4abe44ce061e335b87847f728b1d
size 384104
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06c126b2c493648c89b09b514825fc4953469f58bf623c2e59ae05b7afecb29f
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f6a130d7e1881c443e20671efe1583a0f111c69ccb5aebb77ff79a6e0f0a666a
size 384104
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9febaf9a937f1509b842880d59613f4a1931f7bae9c62f613970b21f7d58c411
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3bdd1ecd301d80490dae24186ac8587e1be6423919542b101afc86a40a816b31
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:814774c92c0e4961575f6ed9d6b0984a3a1c969dd3eb40326c08233eac648bc0
size 384106
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b640b44af01112e1d6012f6075e634601fb2ea079703620ce9a53f909bd8dcb
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8d7c72a95403ab513b2a177b04f0cd1085baacae6125d0758fa03a9b3121d4a
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:99d645b71370660a9f12213333bc5314623d6f14d0802e8f38c3b54de73ea76e
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa7efb7572f738a9dc926b96238bb410b05766434ff2a4d060e33da9d8ab3e79
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75d55b233bda7c5ad7b25880fab1534a1e1811b6f75ca469ac698c4b06707004
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e47190f6a4d81b2a05b090754dcb2502ca4147757b3044ebefab720b76794ff
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f6b0253549fc1a0799e37ff41ca7ce577ddd57dd066317d8b2ff4933574b4d6
size 384102
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f6dce6036191599a58fc4bd5dc5dddb39afcb59f77e61fab782b8d66a2005e0
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47bc01590278edd3e161bd77f054aec3912a68a4476b25ea6feb5adbb81a160a
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b683cfedc348fc3b16f16b36a3344fe6351dc76508e0ac58df77da449178ad1c
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48268bcecf6f153804826a27449e3053fab90f8d2c78161d0020170cd90cdf75
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e653ef19514157e9273e524384c96aa8974faf74570607c75504e4f26c2768e
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7105f8e099e2cfd93cb4eef6d34cb44a6fabe8fb2592fd14aabefc06fb1373e8
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f457c608ede9333e3a126a5b2e47411751630be24128189322b87768b2750441
size 384094
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cdb30a6f7d76731647e70fd802e8468b0a4e827f5623a26719d1bb240878f991
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2dcbf1f52565d56f0b0d78460513d0de3a89206742f9ef3350722e829a1f44c3
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bac4de81c357e03b326b621c9968e667a41183b0e30e36dc1fccb8b0e2c4ee05
size 384104
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:436ac8c29ffca6eeb88a794f97041bc6c9a03d37ebf6df78d6dd14346704592c
size 384106
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5957796b3b47e9c6d7e7f00aaa99bcae8f26d8b82d2af64fd5b9ab38ad3970bb
size 768094
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:64367496e0ebe242beafa32af4a903779d2d78b7e6ab8e704de1f4264c4c375c
size 384104
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:deb78e1c829e82da11fc93aa8fa5f929c12238fd5dda5f6c7e6fed5e0cf64078
size 384096
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1fe4d7119921e3dc48a54a31482345d4985f067a304ce57f35e3748a0f74787d
size 384094
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32207f9bced6c259108cc7b463df83ac5dece6dfa26d3440d950664a10797b83
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e5ad12e8615314f66f6217ec236bbb6caebfd074a9a68da8c5b18f6aa477a39d
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8e81804261a92a617cecf226237c375ab14f1d5828d1d2322aecd160f1f3494
size 384094
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f176216831363e0cd711cc234453d64288fb4ab1c2556ce925ea5c65d0880e4e
size 384104
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca13f705411e0a6251e2bb2945bbdef5ad2e03b3a7dec3610c19a95287b55141
size 384100
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f693fe766b9347abf36b0ee2d0fa60fa0163fe201269b18fc7acff9b5ca907b1
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e13a6a25585e90fd59b08422c85d895f4132db3424398ff976317344261b64c
size 384098
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ecd7644f2ffc377b234ddcd1c257a34c974de6002cce75c57f5bd198713ed3bb
size 384102

Some files were not shown because too many files have changed in this diff Show More