b46a5f4d83
Updating podspec, readme and project settings for ResearchKit 2.0 stable release
2018-09-04 19:30:52 -07:00
e1d47c2882
Adding remaining audio files for Speech in Noise to Git LFS
2018-09-04 19:21:11 -07:00
dbc21a1c2a
Changing lfsconfig to recursively track the LFS-files folder
2018-09-04 19:13:28 -07:00
f73645127c
Adding proof of concept LFS file for speech in noise
2018-09-04 19:04:17 -07:00
95425a81ae
Stable Release 2.0
2018-09-04 16:58:27 -07:00
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
543fb892b1
adding new css style class to handle signature image
2018-09-04 16:17:01 -07:00
0598cbdbd3
Merge pull request #1167 from srinathtm-apple/FixForIssue1136
...
navigationFooterView should adopt app tint color
2018-08-28 23:27:29 -06:00
c1e6dc0a54
navigationFooterView should adopt app tint color
2018-08-28 17:44:32 -07:00
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
f02d401737
Merge pull request #1162 from srinathtm-apple/FixForIssue1142
...
Fix for issue #1142
2018-08-28 12:08:20 -06:00
ec33ec5f8c
minor change in import which was causing build failure
2018-08-20 12:42:19 -07:00
d23db60948
pass the fhir data object directly to the logger
2018-08-20 12:41:51 -07:00
fd36ad5463
Update to use latest WKWebView api
2018-08-17 11:51:26 -07:00
06360f246d
Allow autoplay and inline media playback in ORKWebViewStep
2018-08-16 14:47:39 -07:00
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
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
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
6da6842adb
Merge pull request #1157 from ysf199711/master
...
Update Consent Doc
2018-08-07 17:35:03 -06:00
a016834614
Merge pull request #1139 from joshavant/add-docset
...
Add docset
2018-08-07 17:33:44 -06:00
6d0e6e1931
Apply changes to old document
2018-08-08 02:37:55 +08:00
65c5ca082b
Added suggested changes
...
Will update original consent doc
2018-08-08 02:25:01 +08:00
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
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
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
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
b32c87a3b2
Merge pull request #1 from ResearchKit/master
...
Merge Updates
2018-08-03 12:21:38 +02:00
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
a1600c6e0b
Merge branch 'master' into speech_recognition_waveform_axlabel
2018-08-02 12:37:01 -06:00
ebc0eeef7d
Update pdf code -> swift
2018-08-02 17:47:48 +02:00
020b21f261
consentShare -> swift
2018-08-02 17:42:51 +02:00
403ef4e6ee
Oops, wrong code block
2018-08-02 17:39:45 +02:00
74d3f60562
Code block 4 -> swift
2018-08-02 17:37:22 +02:00
bf3b66e6ff
Code block 3 -> Swift
2018-08-02 17:30:12 +02:00
9265d45878
Code block 2 -> Swift
2018-08-02 17:22:53 +02:00
f07c4fe7ff
Correct some label typos
2018-08-02 17:11:48 +02:00
81e106dde0
First code block -> swift
2018-08-02 17:09:53 +02:00
cb45004eb0
Init, prepare to replace objc with swift
2018-08-02 16:57:59 +02:00
f683a494df
Update more image formatting and add syntax highlighting
2018-08-02 16:56:31 +02:00
f7e2e39e1c
Update headers and image formats
2018-08-02 16:34:27 +02:00
6147283a63
Rename to InformedConsent-template-ObjC.markdown
2018-08-02 16:00:17 +02:00
2a02e94987
Merge branch 'master' into tapping_button_ax
2018-08-01 17:04:14 +09:00
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
326e44b055
[Project] Update to Xcode 9.4 recommended settings
2018-07-31 22:58:26 -07:00
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
26c7884002
[Project] Make ORKHTMLPDFPageRenderer.h private again
2018-07-31 00:59:51 -07:00
3bc160c5b2
[Tests] Fix ResearchKit unit tests
2018-07-31 00:43:51 -07:00
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
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
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
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
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
f605a10dfb
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez/xcode-9.3
2018-07-30 22:27:33 -07:00
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
ebc948a8cc
Merge pull request #1132 from ysf199711/master
...
Update Chart & Graph Doc
2018-07-30 13:55:02 -06:00
584302cd2f
Also add a hint so users know they can simply double tap to end recording.
2018-07-30 13:54:01 +09:00
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
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
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
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
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
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
d58ac3982c
[ORKTowerOfHanoiStep] Fix warning by removing unallowed init
2018-07-25 23:36:20 -07:00
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
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
a00a237c29
Add docset
2018-07-23 19:30:47 -05:00
caed724ce2
Merge pull request #1137 from tobiasjungnickel/ScreenType_iPad_10_5
...
ScreenType for iPad 10.5
2018-07-23 09:08:20 -07:00
cbd1ccb13d
adding iPad 10.5
2018-07-21 12:12:36 +02:00
fa23b2a841
reverted back to original initializer
2018-07-18 13:38:03 -05:00
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
8c0236e33a
implement requires scroll to bottom to agree
2018-07-17 07:44:47 -05:00
ac18d816ee
Merge pull request #1134 from anaglik/cocoapods-fix
...
Fixed position of ORK_CLASS_AVAILABLE
2018-07-13 16:34:30 -06:00
143184f792
Fixed position of ORK_CLASS_AVAILABLE.
2018-07-13 16:38:41 +02:00
6beb7bfbf1
Comment indentation
2018-07-11 01:07:35 +02:00
b2707702f1
Indentation
2018-07-11 01:06:52 +02:00
1e87138b9a
Update syntax in code example
2018-07-11 01:06:09 +02:00
91c6e0e7da
Added how to update a chart graph
2018-07-11 01:00:06 +02:00
5c6e8662c5
Remove Fig Captions
...
where the line above the figure is clear enough to explain
2018-07-11 00:46:25 +02:00
25444b68fd
Update ChartsAndGraphs-template.markdown
2018-07-11 00:41:44 +02:00
d9f2e1171e
Update ChartsAndGraphs-template.markdown
2018-07-11 00:41:19 +02:00
101e792254
Add calls to remove self from the notification center observers after deallocation.
2018-07-08 20:58:25 +01:00
266b9f1c71
updating ResearchKit 2.0 Release notes
2018-06-04 16:20:42 -07:00
dcae4e5775
adding ResearchKit 2.0 Release notes
2018-06-04 16:17:31 -07:00
edc9f445ab
ResearchKit 2.0
2018-06-04 14:24:57 -07:00
a23a22f7bf
Merging updates
2018-06-04 14:03:29 -07:00
aea49a7950
Merge pull request #1104 from srinathtm-apple/toneAudiometryCleanup
...
ORKToneAudiometry cleanup
2018-04-12 21:19:31 -07:00
e7a74e4951
updating property in predefined active tasks
2018-04-12 21:17:29 -07:00
78ac8e03f2
renaming bool property per objc conventions
2018-04-12 21:09:28 -07:00
9f980e1144
[Tests] Fix ORKHTMLPDFWriter tests
2018-04-05 00:22:06 -07:00
259446fc8c
[Misc] Rename methods to be more Obj-C compliant
2018-04-04 23:56:40 -07:00
95223d3011
[Projects] Update Swift version to 4.0
2018-04-04 23:31:34 -07:00
b61f071020
[Xcode 9.3] Update all projects to avoid warnings
2018-04-04 22:50:24 -07:00
be31c5784d
[ORKHTMLPDFWriter] Fix nullability warning and rename method
2018-04-04 22:26:01 -07:00
14f8d7ee6c
[Xcode 9.3] Add new shared data file
2018-04-04 22:16:41 -07:00
b32f3db623
[ORKHTMLPDFPageRenderer] Fix warning
2018-04-04 22:16:22 -07:00
4b9c70ed73
Merge pull request #1103 from srinathtm-apple/FixForIssue1102
...
fix for issue #1102
2018-04-04 15:08:23 -07:00
a9a0946c7e
removing duplicate code
2018-04-03 20:18:44 -07:00
8ff4db8384
fix for issue #1102
2018-04-03 01:33:24 -07:00
4019c380eb
Merge pull request #1093 from srinathtm-apple/FixForIssue1014
...
fix for #1014
2018-03-22 03:02:43 -07:00
fe7fc48901
fix for #1014
2018-03-19 13:53:43 -07:00
7634eabd0a
Merge pull request #1090 from srinathtm-apple/FixForIssue1022
...
fix for #1022
2018-03-16 15:51:58 -07:00
3089a3bef5
Merge pull request #1075 from srinathtm-apple/timedWalkTaskCleanup
...
Timed walk task cleanup
2018-03-12 10:58:40 -07:00
cc3afe5102
include turnAroundTimeStep only for positive values
2018-03-12 10:50:22 -07:00
d75ba09918
Merge pull request #1092 from MacroYau/patch/passcode-input-overflow
...
Suppress ORKPasscodeTextField input overflow
2018-03-12 10:32:52 -07:00
5376359c1f
Suppress ORKPasscodeTextField input overflow
2018-03-10 15:11:16 +08:00
9102800ced
fix for #1022
2018-03-07 12:14:46 -08:00
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
2134d5fe3a
Merge pull request #1081 from srinathtm-apple/consentSignatureFix
...
fix for #1071
2018-03-04 22:28:40 -08:00
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
2aa0463673
fix consent name and date layout
2018-02-21 15:20:16 -08:00
f39f8b01a5
[ResearchKit] fix for issue #1019 - toolbar
2018-02-21 23:05:51 +01:00
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
d7ddf072aa
Merge pull request #1074 from srinathtm-apple/FixForIssue1073
...
Fix for issue 1073: error in localization
2018-02-21 02:23:58 -08:00
0610718029
using non-localized string as value, based on feedback
2018-02-20 01:42:52 -08:00
2d4b6a566a
any negative value will bypass turnAroundTime step
2018-02-20 01:42:13 -08:00
b71a07c108
Merge pull request #1069 from Br35Ba56/master
...
Added phone number form item for ORKRegistrationStep #1068
2018-02-20 01:26:47 -08:00
16bb829e6a
create an array of ORKTextChoice instead of an array of NSString
2018-02-19 18:52:05 -08:00
65985167c0
deprecating one of the initializers for timedWalkTask to avoid duplicate code paths
2018-02-19 18:14:40 -08:00
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
0032b6708a
Merge pull request #1067 from danielemden/bugs/ShowTimeLeftLabelForAudioTask
...
Show time-left-label for audio task
2018-02-19 15:21:14 -08:00
425b858206
reverting to using ternary operator to determine key based on limb type
2018-02-19 14:50:10 -08:00
5787764eaf
Added .includePhoneNumber to ORKCatalog accountCreationTask.
2018-02-14 20:04:48 -06:00
b829641bd0
Issue #1068 Added option for phone number to ORKRegistrationStep.
2018-02-14 19:53:16 -06:00
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
5fe7c7f49e
Adding default answer property to ORKTextAnswerFormat and ORKNumericAnwerFormat
2018-02-12 15:26:57 -08:00
403d93d064
Fix capturedImageView layout
2018-02-12 14:35:55 -08:00
ca68d65605
Fix capturedImageView layout
2018-02-12 14:26:39 -08:00
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
c463359725
Added support for Dynamic Types to ORKMultipleValuePicker
2018-02-10 14:02:58 -08:00
decab237e8
Added support for Dynamic Types to ORKHeightPicker and ORKWeightPicker
2018-02-10 13:52:10 -08:00
6577436bd4
Added support for Dynamic Types to ORKValuePicker
2018-02-10 13:44:10 -08:00
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
d520f2963d
[docs] Add first draft of the ResearchKit Reviewing Guidelines
2018-01-25 20:13:47 -08:00
6da912d08a
Merge pull request #1041 from srinathtm-apple/master
...
[ResearchKit] fix for issue #1024
2018-01-11 14:40:06 -08:00
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
c8566b00bf
[ResearchKit] fix for issue #1019
2018-01-10 10:32:18 -08:00
e567a5071c
Merge pull request #1025 from tobiasjungnickel/attributedInstructionStep
...
WIP: ORKInstructionStep detailText as NSAttributedString
2017-12-19 15:48:30 -08:00
87fec7ce3a
adding additional attributed detail text that overrides detail text if set
2017-12-19 21:25:41 +01:00
51e4761e27
Merge branch 'master' into attributedInstructionStep
2017-12-19 19:02:07 +01:00
774e638ca7
Merge pull request #1046 from akshay-yadav-apple/master
...
[ResearchKit] Fix for issue #1043
2017-12-18 10:22:51 -08:00
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
05d716c5a2
Remove .swift-version file
2017-12-15 16:10:36 -06:00
3a1f004452
Removing duplicate code
2017-12-13 14:23:56 -08:00
f0db5c3a11
[ResearchKit] Fix for issue #1043
2017-12-13 12:38:23 -08:00
d513fbd6f3
[ResearchKit] fix for issue #1015
2017-12-06 15:34:42 -08:00
c2dfba9870
Merge pull request #1010 from ninoguba/weight_answer_format
...
Added ORKWeightAnswerFormat
2017-12-06 10:13:24 -08:00
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
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
1d2715afb4
[ResearchKit] fix for issue #1024
2017-12-05 17:30:05 -08:00
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
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
80720c1281
Fixes to classes introduces since last March that fail unit tests.
2017-12-04 12:36:46 -08:00
a118762015
Fix definition of the ORKQuestionStepViewController
2017-12-04 11:17:06 -08:00
1a5d537030
Split out results for stroop and web view.
2017-12-04 10:53:01 -08:00
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
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
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
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
51b4c2e539
Fixes #992 . "Consent PDF with htmlReviewContent doesn't add signature page
2017-11-30 15:06:44 -03:00
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
c8195bddbc
ORKTest: Add shouldPresentStep validation example to exercise skip logic in form step
2017-11-28 18:05:20 -05:00
bd2319e74d
Reset skipped state when user updates answers in form step
2017-11-28 18:04:00 -05:00
ee443eadee
Merge pull request #929 from tobiasjungnickel/tableStepSectionHeader
...
Extend ORKTableStepSource for custom section header
2017-11-26 15:41:44 -08:00
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
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
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
470582b176
Merge pull request #1030 from CareEvolution/WebViewStep
...
Add "ORKWebViewStep"
2017-11-21 16:53:09 -08:00
6c4075258b
Add back to ORKTest
2017-11-21 16:44:58 -05:00
4bf5df0a19
Merge flog
2017-11-21 16:40:02 -05:00
fbb39e1cc5
Fix merge flog
2017-11-21 16:37:54 -05:00
6319d2861e
Remove external url
2017-11-21 16:18:17 -05:00
9c6c08380b
Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into WebViewStep2
2017-11-21 16:11:54 -05:00
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
271bbba44b
[ORKWeightAnswerFormat] Fix serialization tests
2017-11-20 22:39:27 -08:00
83d28ede08
[ORKWeightAnswerFormat] Fix typos
2017-11-20 22:36:08 -08:00
f10573e71b
Merge branch 'master' of github.com:ResearchKit/ResearchKit into ninoguba/weight_answer_format
2017-11-20 21:32:00 -08:00
06a58fab3a
[Misc] Fix additional Xcode 9.1 warnings
2017-11-20 21:30:58 -08:00
b9c5ed66bb
Merge pull request #1031 from rsanchezsaez/rss/fix-unit-tests
...
[Misc] Fix unit tests
2017-11-17 11:35:59 -08:00
db51765a9b
Merge branch 'master' into pr/split-ORKResult
2017-11-17 09:39:52 -08:00
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
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
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
15cc58b874
Merge pull request #1 from rsanchezsaez/rss/weight_answer_format-no-merge
...
[ORKWeightAnswerFormat] Improvements
2017-11-16 12:48:58 -08:00
18b730169f
[ORKWeightAnswerFormat] Re-add ORKTest examples
2017-11-16 01:17:37 -08:00
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
2d6efeb430
[ORKCatalog] Capitalize displayed text for ORKWeightAnswerFormat examples
2017-11-16 00:50:22 -08:00
9cbba81572
[ORKWeightPicker] Update localized measure string to ‘lb’
2017-11-16 00:42:32 -08:00
3108e24830
[ORKWeightPicker] Update ORKTest sample code placeholders
2017-11-16 00:40:39 -08:00
2eefc77cbe
[ORKWeightPicker] Rename fraction methods
2017-11-16 00:35:24 -08:00
e61c9463a5
[ORKWeightPicker] Add extra properties to NSSecureCoding and equality
2017-11-16 00:34:08 -08:00
c1567e8ae6
[ORKWeightPicker] Reuse more code in kg <-> lb converting options; increase conversion precision
2017-11-16 00:26:10 -08:00
af08beeb4c
[ORKTests] Fix ORKImageChoice serialization tests
2017-11-16 00:03:25 -08:00
86beb05399
[ORKNumericAnswerFormat] Rename ‘scale’ to ‘maximumFractionDigits’ and fix serialization tests
2017-11-15 23:47:52 -08:00
7b8b4dd2ce
[ORKRecorderTest] Decrease ork_doubleEqual() precision to pass location recorder tests on the simulator
2017-11-15 23:29:38 -08:00
b3dfb08f50
[ORKWeightAnswerFormat] Use ‘double’ instead of ’NSNumber’ for numeric parameters
2017-11-15 22:54:43 -08:00
b0bf985469
[ORKWeightAnswerFormat] Change order of parameters
2017-11-15 21:55:52 -08:00
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
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
d55689dc5e
[ORKWeightPicker] Replace ‘valueInterval’ and ‘additionalPrecision’ by ‘numericPrecision’
2017-11-15 00:46:50 -08:00
e2a52c7188
[Height and Weight Pickers] Reuse code by leveraing answerFormat’s -stringForAnswer: method
2017-11-14 22:23:21 -08:00
c7ea76a983
[ORKWeightAnswerFormat] Simplify -stringForAnswer: method
2017-11-14 22:22:41 -08:00
73aa1157e6
Revert "[Misc] Update my copyright"
...
This reverts commit cb94f06094
2017-11-14 14:40:44 -08:00
0a40250aea
Add to ORKTest
2017-11-14 09:46:42 -05:00
c3e7db8c0f
Revert "Remove invalid ResearchKit.framework references"
...
This reverts commit eba62c4857
2017-11-14 09:07:35 -05:00
a0ef5b1715
[Assets] Xcode 9.1 insists on reordering some xcassets fields
2017-11-14 01:17:36 -08:00
6f45964342
[ORKTextChoice] Remove deprecated code
2017-11-14 00:50:52 -08:00
31a86204a9
[Misc] Fix ORKTextChoice warnings
2017-11-14 00:42:10 -08:00
2844102696
[ORKAnswerFormat] Fix convenience initializer being marked as designated
2017-11-14 00:30:17 -08:00
82bb27199a
[Misc] Fix strict-prototypes warnings
2017-11-14 00:29:58 -08:00
a3f9680006
[Projects] Update all projects to the recommended Xcode 9.1 settings
2017-11-14 00:27:10 -08:00
f851397de0
Set appropriate end time
2017-11-12 11:25:05 -05:00
e998d0747c
Add loading indicator
2017-11-12 11:22:47 -05:00
3682da0aab
Check answer for type information
2017-11-12 11:10:46 -05:00
973beb0fa8
Add embedded html in sample webviewstep
2017-11-12 11:03:52 -05:00
e8e1c36692
Allow embedding html instaed of a url
2017-11-12 10:19:06 -05:00
b7ddc6d195
Add to ORKCatalog
2017-11-11 10:17:02 -05:00
24dca514a7
Add web view step result
2017-11-11 09:50:42 -05:00
60ccc4bfad
Adding base web view step
2017-11-11 09:33:55 -05:00
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
0695468020
Add Info.plist keys for microphone and camera access
2017-11-02 16:49:40 +11:00
b5e625b46f
migrating detailText from NSString to NSAttributedString
2017-10-31 06:24:59 +01:00
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
ea00c5862e
Merge branch 'docs_august17' into 'master'
...
Docs august17
See merge request !83
2017-10-03 13:12:06 -07:00
e6b3ad79f0
[Docs] removing all references to Utility and adding back Passcode
2017-09-26 17:04:15 -07:00
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
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
51acba1999
Added support for multiple choice in ORKImageChoiceAnswerFormat
2017-09-18 23:07:30 -07:00
a984ace443
Added vertical layout option to ORKImageChoiceAnswerFormat
2017-09-18 20:35:00 -07:00
b0a915a30c
Fix for #1012 to prevent inch value from decrementing unexpectedly
2017-09-16 10:57:22 -07:00
5d9bb6c833
Corrected the HK units to match corresponding canonical unit for Weight and Height
2017-09-16 10:25:58 -07:00
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
d772f3885a
Fixed weight value conversion discrepancies; Limit ounce picker values from 0 to 15
2017-09-15 21:56:33 -07:00
6b7277cf72
Added minimum and maximum value validations
2017-09-14 21:44:23 -07:00
45e7f6b529
Added checking min and max values
2017-09-14 20:26:03 -07:00
feae58cde6
Added support for initializing ORKWeightAnswerFormat with default/min/max values and additional precision
2017-09-14 20:02:02 -07:00
9a635b7227
Added ORKWeightAnswerFormat
2017-09-05 14:50:24 -07:00
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
2ba1e8a2fd
Fix merge from master
2017-09-05 10:08:50 -07:00
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
8e2d6a1f34
Removed example of Video Step
2017-08-22 15:39:29 -07:00
30f434f18f
update screenshot
2017-08-07 16:29:46 -07:00
4645015361
Active Tasks: Edits per SM. Overview and Creating Surveys: new content.
2017-08-07 12:13:10 -07:00
aa15382dc1
Added screenshots and text to Active Tasks.
2017-08-03 19:38:37 -07:00
1e8f90f0c8
Merge branch 'Github_master' into Gitlab_master
2017-07-24 12:26:34 -07:00
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
f561f2c51d
Merge remote-tracking branch 'origin/stable'
...
merging stable
2017-07-19 10:58:21 -07:00
7b40d16da2
Merge pull request #974 from hasiniran/master
...
Issue #973
2017-07-17 11:38:02 -07:00
184b1938e5
Version Fixes
2017-07-13 11:51:31 -07:00
44c88877c5
Fix for CocoaPods
2017-07-13 11:42:25 -07:00
6f2ac3f671
Fixes
2017-07-13 11:19:33 -07:00
a2d2b13d58
COnvergence
2017-07-06 18:15:56 -07:00
007583929c
Convergence
2017-07-06 18:08:13 -07:00
e52e22e8f5
Convergence
2017-07-06 15:48:38 -07:00
c97d6bd78c
Convergence
2017-07-06 15:33:24 -07:00
56c3d19cb1
Added decimal scale limit to ORKNumericAnswerFormat
2017-06-28 14:20:06 -07:00
724dd34bac
[ORKTest] Re-add Stroop Task
2017-06-21 00:48:32 -07:00
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
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
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
05be5f9ae7
Convergence
2017-06-07 10:49:07 -07:00
e6e4698306
Convergence
2017-06-07 10:10:19 -07:00
2efdb9d56f
Merge pull request #976 from netbe/fix/bundle-version
...
Update bundle version
2017-05-04 13:45:40 -07:00
6907cedf95
Update bundle version
2017-05-02 19:20:49 +08:00
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
221996b73a
Removing bundler files
2017-04-26 22:15:19 -05:00
c309d69349
Update copyright
2017-04-26 22:13:47 -05:00
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
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
b9351232fc
Update README.md Swift example code to latest Swift syntax
2017-04-08 17:54:34 +02:00
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
76cec79983
[Deprecation] Restore deprecated methods which are removed in other PRs
...
This partially reverts commit c3d25d6edc
2017-04-07 00:48:08 -07:00
3697e01b6f
[ORKTest] Fix serialization tests
2017-04-06 02:15:26 -07:00
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
261bc598f0
[Project] Remove unneeded podspec file
2017-04-06 01:16:22 -07:00
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
a4e49d490d
Fix class visibility for new types of Steps, fixes #649
2017-04-03 17:04:20 -04:00
6bde09345f
[ORKTest] Homogenize step and item identifiers
2017-04-02 23:13:11 -07:00
a81c577fc3
[ORKTest] Convert iterruptible example to block based interface
2017-04-01 01:13:02 -07:00
2058936108
Fix equality for ORKLocation
2017-03-31 17:00:16 -07:00
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
fb6dd4782a
Fix issues with ORKLocation merge from master
2017-03-31 11:23:34 -07:00
4a944cc972
Merge branch 'master' into pr/split-task-modules
2017-03-31 10:51:07 -07:00
022144ad28
Fixes #833 . "Date Step - Mismatch between picker.date and what is shown in the UIDatePicker”.
2017-03-31 10:59:54 -03:00
238cae5d31
[ORKTest] Consolidate the rest of examples that use 'stepViewControllerWillAppear:'
2017-03-30 21:52:52 -07:00
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
3b74dd93f6
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/ORKTest-refactor-b
2017-03-30 20:19:54 -07:00
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
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
56a261eb27
[ORKLocation] Revert wrong 'copy' to 'assign' ivar change
2017-03-30 10:48:51 -07:00
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
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
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
2a196bc768
[ORKTest] Update copyright headers for new files
2017-03-28 20:13:12 -07:00
6bb2313a1f
[TaskFactory+Forms] Resolve merge conflict
2017-03-28 20:07:55 -07:00
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
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
ceca4baf42
Closes #922 redefinition of module error
2017-03-28 20:53:47 -04:00
e83c26208b
Fix Redefinition of module error in Xcode 8.3
2017-03-28 20:50:02 -04:00
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
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
343be912d0
[ORKtest] Reorganize TaskFactory into categories
...
Also, reorganize some project files.
2017-03-28 01:23:30 -07:00
0972a789a4
[ORKTest] Remove unneeded import
2017-03-27 22:13:22 -07:00
fe994cea75
[TaskFactory] Add missing 'introStep' on the Navigable Ordered Task
2017-03-23 21:47:13 -07:00
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
d451b26788
[ORKTest] Remove 'Task' from all item names
2017-03-23 21:47:13 -07:00
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
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
a0e1317c22
[TaskFactory] Add missing CompletionStepTask to task switch
2017-03-23 21:46:56 -07:00
bfe3e691e1
Split the predefined Active Task modules into a separate file.
2017-03-22 11:42:00 -07:00
392ee67733
Move temp file back to original file name.
2017-03-22 10:43:00 -07:00
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
109f69b9df
temp split of ORKOrderedTask
2017-03-22 10:23:14 -07:00
79d61223c6
Split out ORKOrderedTask task modules into a separate file.
2017-03-22 10:20:55 -07:00
f97b4923b6
Fix nullable for ORKLocation
2017-03-21 23:46:12 -07:00
e391fbf254
Fixed bug with ORKTextChoice not using the correct tint color
2017-03-21 15:40:56 -07:00
8de0d5c755
Split ORKPasscodeResult into a separate file.
2017-03-21 14:38:09 -07:00
e030fff263
Split ORKSignatureResult and ORKConsentSignatureResult into separate file.
2017-03-21 14:32:53 -07:00
f4753aacf1
Split ORKVideoInstructionStepResult into a separate file.
2017-03-21 14:17:50 -07:00
2075cf8fb1
Split ORKQuestionResult subclasses into a separate file.
2017-03-21 14:00:34 -07:00
e9e165e10d
Remove unused private ORKDataResult subclass.
2017-03-21 13:34:50 -07:00
121507db1c
Split ORKCollectionResult subclasses into separate file.
2017-03-21 13:33:04 -07:00
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
96712fcfcd
Merge pull request #954 from rochoSC/bug-fix-917
...
Fix for issue #917
2017-03-21 11:30:04 -07:00
bac6fff8f1
Changed upper duration limit from 120 to 1200
2017-03-21 11:45:14 -05:00
cb94f06094
[Misc] Update my copyright
2017-03-20 22:18:51 -07:00
377120ac38
[TaskFactory] Update copyright
2017-03-20 22:17:34 -07:00
161e56c738
[ORKESerialization] Fix typo
2017-03-20 11:54:16 -07:00
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
4ff30c68fe
[ORKTest] Extract task-creating methods to new TaskFactory class
2017-03-19 19:30:08 -07:00
8e3aaa4246
[ORKJSONSerializationTests] Simplify property initialization by generalizing usage of the orktest_init helper
2017-03-19 18:30:21 -07:00
4f087ce783
[ORKAnswerFormat] Indentation fixes
2017-03-19 18:05:13 -07:00
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
4da2747943
[ORKTextAnswerFormat] Replace 'validationRegex' (the patterm) and 'validationRegexOptions' properties by 'validationRegularExpression' (an NSRegularExpression object)
2017-03-19 17:53:40 -07:00
10bb15f253
[ORKRegistrationStep] Clarify 'passcodeValidation' serialization comments
2017-03-19 15:35:48 -07:00
15601c420a
[ORKTextAnswerFormat] Change 'validationRegexOptions' default value to 0
...
And update documentation accordingly.
2017-03-19 15:34:45 -07:00
8d8b2e3db6
[ORKTextAnswerFormat] Fix merge issue
2017-03-19 15:17:27 -07:00
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
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
c5d864dbb4
Updating license & copyright
2017-03-16 10:36:27 -05:00
9e9ba10a52
Add swift-version file for pod lint
...
pod lib lint --allow-warnings now passes
2017-03-16 09:50:03 -05:00
06fe8e8ce9
Add bundler to ensure consistent version of cocoapods
2017-03-16 09:50:03 -05:00
692d7b50a4
Allow the renderer to declare it's own width & height
2017-03-16 09:50:03 -05:00
55dd93238e
Modify ORKConsentDocument to allow passing a renderer
2017-03-16 09:50:03 -05:00
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
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
a8777b84b5
Merge pull request #947 from stevemoser/patch-4
...
Add NSHealthShareUsageDescription key
2017-03-15 10:16:06 -07:00
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
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
a7bb837e4b
Fix documentation
2017-03-15 12:05:42 +08:00
ca99dcbc2d
Add example to ORKTest's Selection Survey
2017-03-15 11:53:52 +08:00
9f06cc0575
Implement factory method in ORKAnswerFormat
2017-03-15 11:52:14 +08:00
2dba4fd450
Add documentation
2017-03-15 11:30:27 +08:00
47fc7c8475
Override hash() in ORKBooleanAnswerFormat
2017-03-15 11:18:31 +08:00
f7c9ad2692
Fix copyWithZone() implementation
2017-03-15 11:16:55 +08:00
a600a87480
Add NSHealthShareUsageDescription key
...
This prevents a crash during the fitness task.
2017-03-14 21:07:47 -04:00
1cd821b2da
Fix encoding to use ENUM instead.
2017-03-14 16:46:11 -07:00
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
b3f7f0ad90
Fixed code review issues with formatting
2017-03-14 14:12:35 -07:00
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
a133f6a3a0
Merge branch 'master' into pr/add-multicomponent-picker-format
2017-03-14 13:50:20 -07:00
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
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
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
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
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
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
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
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
2208a8bcfd
Merge pull request #940 from johnsaigle/readmeUpdate
...
Update README to reflect new ORK syntax
2017-03-14 10:30:30 -07:00
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
56243d7cd6
Merge branch 'ResearchKit/master'
2017-03-12 13:42:58 -04:00
28c5e75375
Fix serialization and add tests
2017-03-11 16:06:59 +08:00
df4be2f4c4
Add NSCoder support
2017-03-11 15:22:17 +08:00
9a778eafcd
Add example to ORKCatalog
2017-03-11 11:55:37 +08:00
4c8a05251c
Add custom yes and no strings option for ORKBooleanAnswerFormat
2017-03-11 11:42:52 +08:00
c0851d8f2e
Update README to reflect new ORK syntax
2017-03-09 13:52:01 -05:00
5c69459f6b
Add customizable decimal place option for ORKYAxisView value labels
2017-03-09 16:16:29 +08:00
66adcfd387
Add customizable decimal place option for ORKGraphChartView scrubber label
2017-03-09 16:08:21 +08:00
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
82dc103bbf
Fixes in response to code review.
2017-03-07 15:17:16 -08:00
c17e90d775
fix code review issue.
2017-03-07 14:26:13 -08:00
d649b4a14d
Fixed code review issues
2017-03-07 14:23:56 -08:00
7a6dd5c580
Fix code review issues.
2017-03-07 13:50:38 -08:00
65537987df
use self.footnote.hash
2017-03-07 13:23:50 -08:00
1ae3f86279
Fix missing passcodeFlow serialization, copying, encoding and equality
2017-03-07 11:41:05 -08:00
e4d2187871
Merge pull request #877 from sroymdsol/Expose_passcode_flow_types
...
Expose passcode flow types
2017-03-06 11:25:35 -08:00
9499035725
Update to check programmatically for iOS 10 or watchOS 3 availability
2017-03-03 13:37:11 -08:00
3680d05f38
Fix HKCharacteristicTypeIdentifierWheelchairUse iOS10 issue
2017-03-03 12:33:42 -08:00
42a2d0efb8
Check for iOS10 for HKCharacteristicTypeIdentifierWheelchairUse
2017-03-03 11:07:51 -08:00
0a8165ca35
Fix tests for ORKVideoCaptureStep
2017-03-03 00:54:22 -08:00
325142bec2
Merge branch 'master' into pr/add-primitive-number-to-equality-test
2017-03-03 00:39:57 -08:00
9b137318e0
Add space between imports and @implementation
2017-03-01 14:11:01 -08:00
2330a21426
Cleanup in response to code review.
2017-03-01 14:07:07 -08:00
a09b5f3a70
For direct inheritance from ORKStepViewController, use parent results rather than added results.
2017-03-01 10:00:50 -08:00
e57e99b290
Merge remote-tracking branch 'origin/master' into pr/add-result-to-stepViewController
2017-03-01 09:29:59 -08:00
64780981f2
Merge branch 'master' into pr/add-multicomponent-picker-format
...
# Conflicts:
# ResearchKit/Common/ORKAnswerFormat.m
2017-02-28 15:44:37 -08:00
787844d2a0
extend ORKTableStepSource to return custom title and view for header in section
2017-02-28 11:17:19 +01:00
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
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
56d45c3a96
Merging latest public master
2017-02-23 14:58:10 -08:00
f45a6f629f
Merge branch 'master' into pr/update-healthkit-answerformat
2017-02-17 09:35:45 -08:00
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
2843759bcc
Merge pull request #913 from stevemoser/patch-3
...
Add missing height question
2017-02-09 10:15:58 -08:00
a6509da0b1
Add missing height question
2017-02-07 15:51:48 -05:00
fc8c18ec0a
Move healthkit read permissions to ORKStep
...
# Conflicts:
# ResearchKit/Common/ORKOrderedTask.m
2017-02-03 11:21:32 -08:00
badfbf0ad1
[Update] ResearchKit (1.4.1)
2017-02-01 15:10:08 -08:00
3a630b3959
Adding timer label and error scores to trail making test
2017-01-31 13:30:04 -06:00
a2a6fef6aa
Added test for checking the hash to equality tests.
2017-01-30 14:04:39 -08:00
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
5ee602bbee
Deleting previous Tremortest2 image, replaced by TremortestLeft and TremortestRight
2017-01-30 12:22:33 -07:00
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
182cb27551
Merge pull request #904 from stevemoser/patch-2
...
Fix ORKTimedWalkResult isEqual: and copyWithZone:
2017-01-30 08:54:35 -08:00
e54f09d973
Merge pull request #903 from stevemoser/patch-1
...
Fix fashion typo
2017-01-30 08:52:35 -08:00
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
eae5eb5458
Fix fashion typo
2017-01-28 14:59:08 -05:00
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
d36b53336b
Fixed warnings about int cast.
2017-01-26 16:23:37 -08:00
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
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
e9569123fd
Pull request #899 - Requested changes - Added Medable Copyright.
2017-01-25 21:35:38 -03:00
d5ac624b24
Pull request #899 - Requested changes.
2017-01-25 21:28:43 -03:00
5aade34809
Clarified instruction wording for trail making test
2017-01-25 15:06:30 -06:00
d7b44f890e
Merge branch 'master' into pr/add-module-trailmaking-test
2017-01-25 15:00:30 -06:00
250a18ee26
Merge branch 'master' into pr/ui-step-footnote
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2017-01-25 10:54:55 -08:00
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
1afe85b259
Merge pull request #769 from oliverschaefer/videoInstructionStep
...
Video Instruction Step
2017-01-25 10:43:52 -08:00
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
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
b1bc2e649d
Merge pull request #7 from MacroYau/feature/videoinstructionstep
...
Implement requested changes in Video Instruction Step
2017-01-25 08:38:56 +01:00
61eb619e3d
Update ORKESerializer
2017-01-25 14:10:01 +08:00
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
80d707b094
[ORKSignatureView] Remove needless '_' prefix from method names
2017-01-24 20:48:35 -08:00
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
4b143997b8
Implement requested changes
2017-01-25 11:02:42 +08:00
6438c4770a
Resolve merge conflicts
2017-01-25 10:56:39 +08:00
ab20d025e3
Merge branch 'master' into pr/add-multicomponent-picker-format
...
# Conflicts:
# ResearchKit.xcodeproj/project.pbxproj
2017-01-24 14:16:20 -08:00
e8660e83ad
Merge branch 'master' into pr/update-healthkit-answerformat
...
# Conflicts:
# ResearchKit.xcodeproj/project.pbxproj
2017-01-24 14:13:33 -08:00
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
c024cbd503
Merge pull request #758 from Sage-Bionetworks/pr/ui-add-ORKPageStepViewController
...
Add ORKPageStep and ORKPageStepViewController
2017-01-24 13:49:10 -08:00
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
7212f3c663
Merge pull request #845 from Sage-Bionetworks/pr/tablestep-source
...
ORKTableStepViewController improvements
2017-01-24 13:19:46 -08:00
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
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
a9d1ef573d
Minor formatting changes requested during merge
2017-01-24 14:48:33 -06:00
dc185c69e4
Fix merge conflicts
2017-01-24 12:43:33 -08:00
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
742b6f01ab
Merge branch 'master' into pr/add-module-trailmaking-test
2017-01-24 14:13:54 -06:00
2af14cfa68
Cleanup code style.
2017-01-24 12:03:39 -08:00
2a3ffd2b18
Merge pull request #890 from rsanchezsaez/rss/ib-designable
...
[Charts] IBDesignable improvements
2017-01-24 11:56:11 -08:00
2f72c15451
Cleaned up code style.
2017-01-24 11:55:52 -08:00
74a8a0ec6d
Merge branch 'master' into pr/tablestep-source
2017-01-24 11:52:00 -08:00
06ce98338a
Merge branch 'master' into pr/ui-step-footnote
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2017-01-24 11:51:02 -08:00
541ae005b6
Merge pull request #807 from slichlyter12/master
...
Added gesture recognizer to MapView for ORKLocationAnswerFormat
2017-01-24 11:47:19 -08:00
090877e5d9
Merge pull request #859 from rsanchezsaez/umbrella-headers
...
[Umbrella headers] Update #imports to framework format
2017-01-24 11:45:27 -08:00
3b41a38158
Fix warnings about the designated initializer
2017-01-24 11:42:05 -08:00
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
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
e818d99489
Merge pull request #6 from MacroYau/feature/videoinstructionstep
...
Resolve merge conflicts
2017-01-24 09:33:21 +01:00
2fe68f6ac0
Fix ORKCatalog example
2017-01-24 14:00:20 +08:00
ec839b490c
Resolve merge conflicts
2017-01-24 13:54:07 +08:00
a2ae36e08c
Resolve merge conflicts
2017-01-24 13:18:21 +08:00
e9e6e781ae
Merge branch 'master' of github.com:ResearchKit/ResearchKit into umbrella-headers
2017-01-23 19:27:40 -08:00
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
b2ec0051ba
[ORKSignatureView] Better fit on iPhone 4 sizes
2017-01-23 19:20:49 -08:00
2769f3f880
Show a separator between components.
2017-01-23 15:54:59 -08:00
99195db143
Fix ORKTextAnswerFormat regex to be case sensitive.
2017-01-23 14:39:51 -08:00
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
33673f320a
Merge pull request #814 from celteeka/bug/issue812
...
PR for fixing issue812.
2017-01-23 11:42:13 -08:00
d90c266151
Merge pull request #809 from oliverschaefer/issue784
...
ORKSignatureView invalid graphics context bugfix
2017-01-23 11:23:31 -08:00
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
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
e6c4055dec
Merge pull request #892 from rsanchezsaez/rss/warning-fixes
...
[Misc] Fix warnings
2017-01-23 11:21:14 -08:00
8c1a53cfdf
Add answer format for handling a multiple component picker.
2017-01-20 15:48:12 -08:00
1635216e5c
Merge branch 'master' into pr/update-healthkit-answerformat
2017-01-19 13:20:03 -08:00
f616083f3c
[ORKSignatureView] Increase height and distance of signing line to bottom
2017-01-18 19:54:27 -08:00
a4991240e2
Merge pull request #893 from coreygans/patch-1
...
Update ChartsAndGraphs-template.markdown
2017-01-17 13:41:34 -08:00
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
bdf5f25335
[Projects] Update last upgrade checks to Xcode 8.2
2017-01-09 23:35:09 -08:00
849aba6a3d
[ORKStepHeaderView] Fix nil attribute warning
2017-01-09 23:26:09 -08:00
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
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
1f574ba055
Add missing method call that was lost by merge.
2017-01-06 00:00:28 -08:00
956e338c98
[ORKResultPredicate] Clarify comment on '+ predicateForConsentWithResultSelector:didConsent:' usage
2017-01-05 19:56:56 -08:00
017a28e736
Added unit test and additional comments for usage.
2017-01-05 14:32:39 -08:00
48e5e0baf7
consolidate getting or creating a previous result.
2017-01-03 16:50:43 -08:00
607c96b5d3
Change trailmaking identifiers to ork_extern
2016-12-22 19:51:39 -08:00
8b7eb71b1f
Update externally defined healthkit string enums.
2016-12-22 19:48:32 -08:00
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
02828eff5a
Merge pull request #763 from md0u80c9/predicateTests
...
PredicateTests
2016-12-20 18:14:26 -06:00
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
e4918e28bd
Merge pull request #861 from rsanchezsaez/typos
...
[Misc] Fix some typos
2016-12-16 15:38:05 -08:00
919ba1e7b2
Fix the class of the trialmaking task and remove duplicate text.
2016-12-15 11:09:10 -08:00
e8e00503a4
set type for the trailmaking result array of taps.
2016-12-14 23:37:10 -08:00
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
7752710d0a
Fix serialization tests
2016-12-14 15:30:58 -08:00
c7ac9c9a35
Merge branch 'master' into pr/update-healthkit-answerformat
2016-12-14 15:17:28 -08:00
e57fa02765
Fix serialization tests
2016-12-14 15:17:03 -08:00
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
4ad73b30e4
Fix serialization tests
2016-12-14 14:54:13 -08:00
f885de099b
Merge branch 'master' into pr/ui-add-ORKPageStepViewController
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2016-12-14 14:46:40 -08:00
8abaa9e3d7
Merge branch 'master' into pr/tablestep-source
2016-12-14 14:35:46 -08:00
f50bfc7ff6
Fix serialization tests
2016-12-14 14:28:59 -08:00
c737c14188
Merge branch 'master' into pr/fix-tremor-navigation
2016-12-14 12:24:34 -08:00
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
75b7c2d4e3
Merge branch 'master' into pr/ui-step-footnote
2016-12-14 11:31:15 -08:00
449b4c056f
Merge branch 'master' into pr/ui-step-header-image
2016-12-14 11:06:59 -08:00
92d63e3a8b
Merge pull request #862 from rsanchezsaez/serialization-tests
...
[ORKESerialization] Fix ORKLocation unit tests
2016-12-14 10:44:29 -08:00
33dd18300d
Merge pull request #831 from doreilly/correct-ios10-layout-bugs
...
Revert ResearchKit PR #806
2016-12-13 14:17:51 -08:00
b77119a510
Merge pull request #842 from 2020Deception/master
...
fixes crash when tapping results on ORKCatalog
2016-12-13 14:00:20 -08:00
ce0cfe50f3
More project keys
2016-12-13 13:02:54 -08:00
69160ed4a4
More fixes for project pointers
2016-12-13 12:52:50 -08:00
8819cefdd7
Remove references to private developer team
2016-12-13 12:46:06 -08:00
d238065e25
Fixed ORKTest serialization for trailmaking objects.
2016-12-13 11:48:20 -08:00
89d1860902
Trail Making Test complete
2016-12-13 07:55:11 -08:00
ea113f7b66
Make buttons tapped in error turn red
2016-12-12 16:36:28 -08:00
677e6db943
Adding the Trails active task to the ORKCatalog app
2016-12-10 08:46:32 -08:00
aef19ea441
Add ORKTrailmakingStep to ResearchKit
2016-12-09 14:30:21 -08:00
c41536905e
Fixed typo.
2016-12-09 10:33:36 -05:00
ba5e03e247
Replaced !(==) by !=.
2016-12-09 10:32:58 -05:00
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
97b680d61e
Constrain the width of the icon image.
2016-12-08 16:39:50 -08:00
2cb6fea5bd
Correct the constraints for icon image with no title.
2016-12-08 14:58:25 -08:00
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
dcf59ccd67
Moved the passcodeFlow property and associated enums out of the internal header.
2016-12-08 15:24:16 -05:00
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
0779f9ca1a
Added methods to transform ResearchKit enum to HealthKit enum
2016-12-01 22:51:59 -08:00
883004f331
Fixed issues with the health kit result unit.
2016-11-18 16:19:34 -08:00
ed2ffabb8e
Change wording of predicate test 3
2016-11-17 06:16:10 +00:00
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
a4f69dca57
Slight question changes (from R. Sanchez-Saez's review).
2016-11-15 07:33:00 +00:00
9eba881ce2
Removed unnecessary optional lines.
2016-11-14 23:55:55 +00:00
aa9596b4bb
Fix typos
2016-11-14 11:18:05 -08:00
e1103d8547
Style changes and fix to regular expressions following review by Ricardo Sanchez-Saez.
2016-11-14 07:06:55 +00:00
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
8c8072cdec
[ORKOperation] Fix error message typos
2016-11-13 20:04:15 -08:00
7a4dd58df6
Merge pull request #746 from vtourraine/timed-walk-back-instructions
...
[ORKTimedWalkStepViewController] Add Turn Around step
2016-11-09 13:10:57 -08:00
8314e7d9a1
Update Swift syntax
2016-11-09 16:30:07 +01:00
7696d28f05
Merge upstream master
2016-11-09 16:26:09 +01:00
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
f38e31936e
Merge pull request #863 from malhal/master
...
Templatized arrays in ORKOrderedTask.m
2016-11-08 11:58:02 -08:00
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
519ad1aaf9
Merge pull request #816 from darrenlevy/range-of-motion
...
Range of Motion Active Task
2016-11-08 11:52:45 -08:00
203f48f8dc
templatized arrays
2016-11-08 17:16:43 +00:00
a4cb2723da
[ORKDataCollectionTests] Fix some typos
2016-11-08 01:11:11 -08:00
cb4e06a4c9
[ORKESerialization] Fix CLCircularRegion unit tests
2016-11-08 00:53:22 -08:00
01f4312dce
[Misc] Fix some typos
2016-11-07 22:50:24 -08:00
f1457b69b1
[Projects] Update to Xcode 8.1 recommended settings
2016-11-07 22:34:12 -08:00
692ec6e007
[ORKESerialization] Add extra ResearchKit import to silence error
2016-11-07 22:30:33 -08:00
28ceb9ebe5
[Umbrella headers] Change #imports to framework format
2016-11-07 22:14:17 -08:00
9a69dbbd67
Implementing @umerkhan-apple comments
2016-11-07 18:08:15 -05:00
9bd4df0996
Fix default initializer warnings.
2016-11-01 12:01:27 -07:00
7dd98c8033
Fix init for ORKKeyValueStepModifier
2016-11-01 11:04:18 -07:00
b3934066ed
Allow setting checkmark color and hide cancel.
2016-10-28 14:29:50 -07:00
6089b09963
Merge pull request #853 from ryanschneider/podspec-fix
...
Fix typo in podspec version quoting characters.
2016-10-27 14:42:33 -07:00
57058a66f5
Allow option check of default result source before using previous.
2016-10-27 12:29:53 -07:00
87a7a6a718
Fix typo in podspec version quoting characters.
2016-10-27 11:26:15 -07:00
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
c1493b9c5c
Merge pull request #851 from ResearchKit/podspec
...
Podspec
2016-10-26 13:09:39 -07:00
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
4b456ad2bb
Merge pull request #850 from ResearchKit/stable
...
Stable
2016-10-26 12:48:49 -07:00
125ff93795
Updating podspec
2016-10-26 12:40:56 -07:00
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
ddc023fd4c
Merge pull request #849 from ResearchKit/podspec
...
Updating podspec.
2016-10-26 11:31:58 -07:00
160bb111f0
Updating podspec.
2016-10-26 11:31:36 -07:00
737fa76bc9
Fix another typo in comment
2016-10-25 12:05:10 -07:00
a1b84fbf1e
Fix typo in comment.
2016-10-25 11:05:40 -07:00
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
5c3072b791
Remove TODO warning.
2016-10-24 11:17:30 -07:00
740a7a4bf7
Fix resultForIdentifier to use reverse-enumeration to get last result.
2016-10-20 13:03:20 -07:00
5029c7f3a8
Update to ORKTableStepViewController to use plain-style table for single section.
2016-10-20 11:29:13 -07:00
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
4025e0f427
fixes crash when tapping results
...
checks for results instead of assuming they are present
2016-10-15 13:50:04 -04:00
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
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
cdc8edf78f
Track the initial results separately from the mutating results set.
2016-10-03 11:35:42 -07:00
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
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
b08a2a8627
Merge branch 'master' into pr/ui-add-ORKPageStepViewController
...
# Conflicts:
# Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
2016-09-28 13:21:13 -07:00
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
cc1bfbf7eb
Always set a date for non-nil ORKResult startDate
2016-09-28 12:57:08 -07:00
ea6b1278ce
Change memory copyright to be a learn more link
2016-09-28 12:55:28 -07:00
956e846eb4
There is a copyright that should be included with the memory game.
2016-09-28 12:55:28 -07:00
30742a5043
convergence
2016-09-27 13:42:56 -07:00
ead0650dfb
Convergence
2016-09-26 22:23:17 -07:00
358ffcab78
Update README.md
2016-09-26 14:56:43 -07:00
cc6bfe72e5
[ORKTimedWalkStepViewController] Fix progress view layout
2016-09-06 12:01:44 +02:00
7fe111b750
[ORKTimedWalkStepViewController] Add distinct method for turn around step #746
2016-09-06 11:57:26 +02:00
043f6258a3
Merge branch 'master' into timed-walk-back-instructions
2016-09-06 11:42:05 +02:00
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
01e6728926
PR changes
2016-08-31 07:18:12 +02:00
9f03f45d1b
PR changes
2016-08-31 07:17:37 +02:00
08dfa3fa8d
Initial commit
2016-08-31 07:15:06 +02:00
26f2563a1a
Added gesture recognizer to MapView for ORKLocationAnswerFormat
2016-08-30 13:36:24 -07:00
4f3d0f33df
Merge pull request #803 from Sage-Bionetworks/pr/public-ORKCompletionStepViewController
...
Make ORKInstructionStepViewController and ORKCompletionStepViewController public
2016-08-30 13:14:46 -07:00
608d954197
Merge pull request #806 from asynchrony/fixed_width_constraint
...
Fixed width constraint priority
2016-08-30 10:25:18 -07:00
74326baef4
Fixed width constraint priority
2016-08-30 12:16:19 -05:00
ed1aa683df
PR changes
2016-08-27 10:32:20 +02:00
22589511bb
Merge remote-tracking branch 'apple/master' into videoInstructionStep
2016-08-27 10:19:03 +02:00
4a00ebb8c5
PR changes
2016-08-27 10:15:04 +02:00
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
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
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
b8b7b80f09
Add comment to the aux image.
2016-08-26 10:46:57 -07:00
c204c39daa
play button with sharp edges
2016-08-23 13:12:58 +02:00
d9198f5d13
PR changes
2016-08-23 13:07:10 +02:00
8c98958d17
PR changes
2016-08-23 13:02:30 +02:00
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
eb9464b6ce
Add example use of the auxillary image.
2016-08-22 11:09:42 -07:00
c476ad838e
Merge pull request #798 from gmw/master
...
Typo in function name
2016-08-22 10:06:28 -07:00
c167e4d84c
created the touchIdEnabled serializable encoding, confirm all tests pass
2016-08-22 11:01:15 -04:00
cc18572956
Merge remote-tracking branch 'apple/master'
2016-08-21 18:31:30 +02:00
fe2e5820c4
PR changes
2016-08-21 18:27:48 +02:00
85bea88d6a
PR changes
2016-08-21 17:56:43 +02:00
77eb12636a
Typo in function name
2016-08-21 12:02:11 +02:00
27f4197374
Merge pull request #654 from m1entus/master
...
Adding tap duration to Tapping Task Issue #561
2016-08-19 12:47:11 -07:00
34f473d8e5
Add ORKTappingButtonIdentifier rather than NSInteger
2016-08-19 20:47:01 +02:00
396b9c8e13
Clean up and clearly differentiate between ORKPageStep and ORKNavigablePageStep
2016-08-18 22:37:44 -07:00
937e615377
Hide the implementation detail of using a pageTask from the base class of ORKPageStep
2016-08-18 18:58:50 -07:00
6e052a8b1a
Fix back button for the case where this is the first step in the subtask
2016-08-18 17:11:48 -07:00
b71eb952b3
Merge branch 'ResearchKit/master'
2016-08-17 20:24:12 -04:00
c6bb31f514
PR changes
2016-08-17 23:14:53 +02:00
24c540e70c
Merge remote-tracking branch 'apple/master'
2016-08-17 23:11:12 +02:00
0361f242a0
PR changes
2016-08-17 21:51:45 +02:00
9d614ded2e
Merge branch 'master' into videoInstructionStep
2016-08-17 21:41:35 +02:00
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
3e9cc99324
Fixed outdated comment
2016-08-16 13:46:19 -07:00
43ce339890
Fix merge errors
2016-08-16 13:42:46 -07:00
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
67a04562d6
Fix merge errors
2016-08-16 13:15:51 -07:00
f86668e8cb
Merge branch 'master' into pr/add-module-hand-tremor
2016-08-16 12:46:10 -07:00
33ca348856
Merge pull request #770 from rsanchezsaez/rsanchezsaez-charts
...
[Charts] Fix crashes
2016-08-16 12:22:22 -07:00
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
0f92862e52
Merge pull request #772 from md0u80c9/funcComments
...
Documented the ORKPicker functions.
2016-08-16 11:24:34 -07:00
c7a8cdd2c0
Merge pull request #764 from dephillipsmichael/bad_access_fix
...
bad_access_fix
2016-08-16 11:22:19 -07:00
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
d618d45635
Merge pull request #647 from weijentu/master
...
ORKQuestionResult could get truncated Chinese texts
2016-08-16 11:04:20 -07:00
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
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
fbc4dde858
added the delegate call when the prompt for touchID call is complete
2016-08-16 11:38:44 -04:00
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
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
6679fb0922
Merge pull request #787 from 2020Deception/master
...
invalid pointer updates (warning fixes)
2016-08-12 15:23:46 -07:00
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
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
0b4b2ae6e5
invalid pointer updates (warning fixes)
2016-08-12 11:41:02 -04:00
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
856d544fad
Merge pull request #777 from YuanZhu-apple/master_lineGraphHideDots
...
Line graph hide dots
2016-08-04 14:09:03 -07:00
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
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
ddeed599df
Merge pull request #773 from ThreadResearch/master
...
Fix documentation typo
2016-08-01 13:44:03 -07:00
65f525ff38
Fix documentation typo
2016-08-01 11:32:10 -07:00
60bfacf507
Merge remote-tracking branch 'origin/funcComments' into funcComments
2016-08-01 18:35:13 +01:00
0eae7e87f7
Update ORKPicker.m
...
Fixed a conflict.
2016-08-01 18:23:58 +01:00
26597eb334
Merge branch 'master' into funcComments
2016-08-01 18:21:32 +01:00
44c5535a8d
Merge remote-tracking branch 'ResearchKit/master' into funcComments
...
# Conflicts:
# ResearchKit/Common/ORKPicker.m
2016-08-01 18:14:35 +01:00
d06f070e83
Documented the ORKPicker functions.
2016-07-31 23:48:27 +01:00
633d31be97
Merge branch 'ResearchKit/master'
2016-07-30 00:23:15 +01:00
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
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
90d403e62b
PR changes
2016-07-29 22:54:02 +02:00
7f0ca4ec88
PR changes
2016-07-29 21:53:13 +02:00
fc36bca1bd
PR changes
2016-07-29 21:49:37 +02:00
951193cdb8
PR changes
2016-07-28 23:13:23 +02:00
0cb0f5c8ff
PR changes
2016-07-28 22:57:23 +02:00
2ff5a335e2
Initial commit
2016-07-27 17:14:13 +02:00
6a222529af
Merged remote-tracking branch master
2016-07-27 16:32:08 +02:00
fd2edde5a4
Merge remote-tracking branch 'apple/master'
2016-07-27 16:29:37 +02:00
38c379476b
Expose method for going to a given step
2016-07-26 23:33:17 -07:00
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
e14d327e3b
Adds support for drawing plots within a chart without individual data point indicators.
2016-07-25 13:58:48 -07:00
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
45eb65e721
When going back to an ORKPageStep, go back to the last step with a result.
2016-07-25 13:08:31 -07:00
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
ba78feb4dd
Providing a scale factor property in ORKPieChartView.
2016-07-25 12:36:56 -07:00
7099ed295a
Add accessor for getting the individual step results
2016-07-21 16:00:09 -07:00
963935d659
Allow initializing ORKPageStep with steps as a desgnated initializer
2016-07-21 10:36:02 -07:00
56a8bc1db3
added check if weak self vc has been dismissed
2016-07-18 14:28:02 -04:00
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
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
64e6c8c9a7
Fix warnings and issues introduced with change to using a task.
2016-07-13 23:55:37 -07:00
0f3c8a88b8
Update ORKPageStep default initializer to be json serializable.
2016-07-13 15:25:47 -07:00
b596e6580d
Include a navigable task in the page step example.
2016-07-13 12:54:44 -07:00
ea848aacf9
Change ORKPageStep to use an ORKTask to navigate.
2016-07-13 12:35:43 -07:00
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
912a8112fb
Fix warning in ORKHeightAnswerFormat due to failure to properly cast
2016-07-11 15:04:58 -07:00
27644a292c
Fix merge conflicts
2016-07-11 15:04:19 -07:00
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
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
ebfbfcb900
Merge pull request #637 from rsanchezsaez/rsanchezsaez-CodeHomogenization
...
[Misc] Code homogenization
2016-07-11 12:49:30 -07:00
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
e11440b036
Merge pull request #643 from rsanchezsaez/rsanchezsaez-ORKHeightAnswerFormat
...
[ORKAnswerFormat] Implement picker-based 'ORKHeightAnswerFormat'
2016-07-08 10:41:15 -07:00
fdedb11fea
Merge branch 'ResearchKit/master'
2016-07-08 17:09:29 +01:00
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
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
7fe3e227ad
[ORKHeightPicker] Fix issue returning empty 'selectedLabelText'
2016-07-08 13:34:17 +02:00
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
e29e7f2b73
Fix cast warning introduced with ORKSignatureResult
2016-07-07 13:24:25 -07:00
f2e133676b
Merge remote-tracking branch 'ResearchKit/master'
2016-07-07 11:09:11 -07:00
0c898b4abb
Language updates to more closely match the wording approved by our IRB.
2016-07-07 10:26:22 -07:00
c1fa1ea154
[ORKHeightPicker] Use cm as the internal answer unit regardless of chosen locale
2016-07-07 18:08:38 +02:00
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
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
88c7c87f28
[ORKHeightAnswerFormat] Fix documentation
2016-07-07 17:29:38 +02:00
6a9da73a8a
[ORKCatalog] Add metric and USC height question step samples
2016-07-07 17:29:24 +02:00
0f0448bff7
Fix ORKCatalog for updated tremor module
2016-07-07 00:28:21 -07:00
fd2c914b68
Add navigation rules to allow user to skip the steps for one hand.
2016-07-07 00:06:05 -07:00
5122948de0
Add Tremot task to ORKTest
2016-07-06 16:51:25 -07:00
19d3624658
Two-handed tremor task
2016-07-06 16:46:03 -07:00
4f68c2bf4e
Allow excluding some active tasks from tremor test
2016-07-06 16:46:02 -07:00
9e1ed9e070
Add initial tremor module
2016-07-06 16:46:01 -07:00
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
b1b25f9ac4
Merge pull request #751 from Sage-Bionetworks/pr/ui-public-signature-step
...
Add public ORKSignatureStep
2016-07-06 16:27:46 -07:00
a5b58c4c8e
Add signaturePath to list of knownNotSerializedProperties
2016-07-06 16:23:31 -07:00
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
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
7b850951ef
More syntax changes
2016-07-06 15:45:48 -07:00
bd5f5bb231
Retain signature state on back navigation
2016-07-06 15:44:16 -07:00
2526450391
More syntax cleanup.
2016-07-06 15:11:06 -07:00
289a45c3dd
Change undefined hand to unspecified.
2016-07-06 14:38:35 -07:00
931c7d7728
More curly brace changes.
2016-07-06 12:06:15 -07:00
6d52269995
Fixed syntax, updated copyright and fixed localized formatting.
2016-07-06 11:49:25 -07:00
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
3d57bf65b8
Moved ORKSignatureStep into Common
2016-07-06 11:21:25 -07:00
e7b75b5f88
Move default title/text for signature to ORKSignatureStep
2016-07-06 09:29:55 -07:00
590bb25559
Update text for tapping skip button and hide once tapping started.
2016-07-05 21:59:11 -07:00
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
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
4ea6fc7d46
Updated comment in ORKTableStep
2016-07-05 14:51:05 -07:00
2289b01f7c
Modified method signature for bilateral tapping task and updated ORKTest and ORKCatalog
2016-07-05 14:35:02 -07:00
4899548438
Deprecated two-finger tapping test without hand specified
2016-07-05 14:25:37 -07:00
bcc85b9a2c
Updated tapping unit test to explicitly check for reverse-compatibility
2016-07-05 14:23:54 -07:00
613d3a676c
Move the two-handed tapping test into ResearchKit
...
# Conflicts:
# ResearchKitTests/ORKTaskTests.m
2016-07-05 14:23:54 -07:00
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
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
9fe59ca7a8
Default ORKTableStepViewController to allowsSelection=NO and simplify cell registration.
2016-07-05 14:19:50 -07:00
b3d72ce28a
Add ORKTableStep with a default implementation for supporting a basic data source
2016-07-05 14:19:50 -07:00
e421214098
Add to the comments describing intended usage of this class.
2016-07-05 14:18:57 -07:00
53e19548c4
Edited comments
2016-07-05 14:18:57 -07:00
f3fdb66cf8
Added comments and updated copyright.
2016-07-05 14:18:57 -07:00
ead682b402
Add files to project and update copyright date
2016-07-05 14:18:57 -07:00
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
b9af6508ac
Added a general purpose step table view controller
2016-07-05 14:18:57 -07:00
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
26da4d8e34
Added serialized properties on ORKActiveStep to ORKTest
2016-07-05 13:53:15 -07:00
6ee2b47dc1
Updated copyright and halfway count property name
2016-07-05 13:37:29 -07:00
84f806ee11
Add walk back and forth task to ORKTest
2016-07-05 12:58:26 -07:00
a24dc1ac56
Added unit tests to check the identifiers and half-way spoken count.
2016-07-05 12:57:29 -07:00
c3618bb104
update pocket image. phone should be inserted speaker-side-out
2016-07-05 12:56:37 -07:00
119b5f19d2
Add halfway spoken instruction to countdown for walking back and forth
2016-07-05 12:56:37 -07:00
5195ed44f1
Add back-and-forth walking task
2016-07-05 12:56:37 -07:00
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
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
859fc28d8a
Fix deprecation warning
2016-07-01 16:39:33 -07:00
ebc4ccacc0
Move example for initializing a custom step view controller into ORKTest
2016-07-01 16:31:53 -07:00
1c3aab92c1
Update the unit test to make it a little more interesting.
2016-07-01 16:28:12 -07:00
70093149b5
Updated comment to add additional description.
2016-07-01 16:28:12 -07:00
d595a0b199
Add unit test for instantiating a view controller and expose stepViewControllerClass method
2016-07-01 16:28:12 -07:00
764b5f8691
Allow steps to instantiate the view controller
2016-07-01 16:28:12 -07:00
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
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
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
d9ebc6d253
Fixed copyrights and removed commented out code
2016-07-01 15:26:20 -07:00
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
69c830b8cd
Code cleanup and fix alert in ORKTest
2016-07-01 14:24:12 -07:00
a5aa647ed0
Remove delegate method for setting the tintColor
2016-07-01 13:40:32 -07:00
d7d923e609
Forgot passcode with delegate methods matching existing pattern
2016-07-01 13:40:32 -07:00
0cbb21d71d
Add missing comma
2016-07-01 13:06:48 -07:00
f5fe7a47f3
Added files to ORKTest for creating example continue button
2016-07-01 13:02:13 -07:00
cbea809430
Add Continue Button to ORKTest project
2016-07-01 13:02:13 -07:00
a65d5da62f
Add test for example usage of continue button.
2016-07-01 13:02:13 -07:00
49f2914063
Mark ORKTextButton_Internal with project
2016-07-01 13:02:13 -07:00
f50340c7e1
Make the continue button public for UI consistency
2016-07-01 13:02:13 -07:00
dfcc02d75f
Merge pull request #639 from rsanchezsaez/rsanchezsaez-ORKHealthKitCharacteristicTypeAnswerFormat
...
[ORKHealthKitCharacteristicTypeAnswerFormat] Expose date picker attributes
2016-06-29 12:36:18 -07:00
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
275cc3ae17
[ORKJSONSerializationTests] Remove unneeded whitespace
2016-06-29 20:18:57 +01:00
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
e444c32eb5
Add missing ORK_CLASS_AVAILABLE to ORKPredicateSkipStepNavigationRule
2016-06-29 10:55:54 -07:00
7c7dfc4861
Added missing ORK_CLASS_AVAILABLE to headers
2016-06-29 10:44:59 -07:00
9b9e941299
Add ORKAudioLevelNavigationRule to the tests for ORKSerialization
2016-06-28 17:58:44 -07:00
27a0755414
Fix typo in documentation for audioTask with sound check
2016-06-28 16:31:48 -07:00
0dfb3455f7
Update documentation and added unit test
2016-06-28 15:04:41 -07:00
47d6b5e0f9
Change method signature and deprecate the old audioTask constructor
2016-06-28 14:45:41 -07:00
dbb0fcf2b7
Change name of step identifier property to destinationStepIdentifier
2016-06-28 14:45:41 -07:00
170ca3e0b6
Added audio wiith sound check to ORKCatalog
2016-06-28 14:45:41 -07:00
2c868e3bb4
Update copyrights and method signature
2016-06-28 14:45:41 -07:00
1abd8bf548
Throw exception if recordingSettings dictionary is nil
2016-06-28 14:45:41 -07:00
5db0f6422e
Update copyright dates
2016-06-28 14:45:41 -07:00
47f1a3bfd1
Added a optional ambient noise check to the voice task.
2016-06-28 14:45:41 -07:00
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
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
05325d6070
Merge pull request #644 from rsanchezsaez/rsanchezsaez-Cocoapods
...
[Cocoapods] Fix podspec to include swift files
2016-06-28 10:22:41 -07:00
38a0394005
[ORKTimedWalkStepViewController] Add turn around time limit parameter
...
As suggested in #606
2016-06-28 17:14:58 +02:00
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
ee446da653
Added test for indexOfStep == NSNotFound
2016-06-27 16:38:38 -07:00
b39c2ea10d
Add unit test for indexOfStep
2016-06-27 16:38:38 -07:00
106b2d969f
Remove ORKOrderedTask_Internal
2016-06-27 16:37:47 -07:00
cd02eefff7
Expose method for getting the index of a step.
2016-06-27 16:37:47 -07:00
55b97af36a
Merge pull request #633 from rsanchezsaez/rsanchezsaez-ORKBarGraphChart
...
[Charts] Implement ORKBarGraphChart
2016-06-27 16:22:34 -07:00
fa50f74e9c
Throw assert on multiple lines - not currently supported.
2016-06-27 16:20:16 -07:00
903e1cbffe
Added example usage of confirmation form item to ORKTest
2016-06-27 16:20:16 -07:00
4cda98e896
Clean up tab spacing for readability.
2016-06-27 16:18:19 -07:00
525d5b2350
Added additional comment and tests for the confirmation answer form item.
2016-06-27 16:18:19 -07:00
191c17930d
Move confirm answer to ORKFormItem
2016-06-27 16:18:19 -07:00
cfe39f8201
Fix issue with autocapitolization
2016-06-27 16:18:19 -07:00
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
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
a20f953467
Add example that uses the step will disappear method.
2016-06-27 14:36:45 -07:00
f41480f5bb
Add unit test of the delgate callback
2016-06-24 12:18:45 -07:00
ddef74e9cc
Updated comment and added direction to the method signature.
2016-06-23 17:31:48 -07:00
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
5715ea13c5
Update comment to match method signature.
2016-06-23 16:33:04 -07:00
41575b830c
Add delegate method to task view controller for step will disappear
2016-06-23 16:27:47 -07:00
c6907b1e9e
Add comment explaining why tracking both object and uint
2016-06-23 14:46:41 -07:00
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
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
0cfce94dd6
Copy the properties of an ORKOrderedTask (or subclass) and mutate the steps.
2016-06-22 22:56:00 -07:00
cb4ff44859
[Charts] Rename 'pointForPlotIndex:' (and related methods) to 'dataPointForPlotIndex:'
...
Also rename 'ORKGraphChartType' to 'ORKValueCollectionType'.
2016-06-23 02:51:02 +01:00
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
e9e2434d5f
Add deprecation warning into protocol work-around for HK iOS 10 support
2016-06-22 11:45:13 -07:00
72fb6d5138
Updated implementation for iOS 8 compatibility to HealthKit for iOS 10
2016-06-22 11:45:05 -07:00
60aa464b02
Add work-around for missing method for HKAnchoredObjectQuery
2016-06-22 11:44:57 -07:00
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
3f258d2c6c
ORKResult start/end dates should not be nullable
2016-06-21 16:37:48 -07:00
aad49eac86
Added delegate method for discarding results without confirming cancel.
2016-06-21 16:12:25 -07:00
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
78d59f7ed8
Merge pull request #636 from rsanchezsaez/rsanchezsaez-ORKNavigableOrderedTask
...
[ORKNavigableOrderedTask] Implement skip navigation rules
2016-06-21 15:12:32 -07:00
a147b2e6e3
Report error (if any) for restoring the saved audio session category
2016-06-21 14:54:46 -07:00
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
0e9ce26b82
Mark audio prompt property as copy rather than strong
2016-06-21 14:28:56 -07:00
e2f284a4cb
Only update the view threshold if the view is loaded
2016-06-21 14:26:52 -07:00
90af9211eb
Only set the threshold if greater than 0
2016-06-21 14:25:15 -07:00
1107bd9dba
Do not set the initial threshold. Zero by default is ignored.
2016-06-21 14:22:04 -07:00
4bcc83ecd3
Merge pull request #716 from king7532/swift3
...
Update `ORKPredicateStepNavigationRule` Swift 2.x formatting to match…
2016-06-21 14:19:27 -07:00
aa86bf3bed
[ORKNavigableOrderedTask] Return empty dictionaries instead of empty arrays
2016-06-21 21:51:00 +01:00
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
01eab7bd0c
PAN-98 - Audio ActiveTask View - add ability to define threshold value
2016-06-21 13:10:17 -07:00
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
072d19c84b
Fix bug where the defaultResultSource is using ivar rather than public property accessor
2016-06-21 11:06:27 -07:00
11effe846e
Merge pull request #625 from shazino/ib-graph-chart
...
Make chart and graph IBInspectable/IBDesignable
2016-06-21 10:18:53 -07:00
c185fce465
Merge pull request #583 from chb/feature/passcode-override
...
Improve Passcode View
2016-06-20 14:47:53 -05:00
4863368e23
Update ORKPredicateStepNavigationRule Swift 2.x formatting to match the style guide
2016-06-20 15:07:39 -04:00
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
c15b98e41a
Update extension to ORKPredicateStepNavigationRule to support Swift 3 and 2.x
2016-06-18 21:32:37 -04:00
9341e85030
Merge branch 'ResearchKit/master'
2016-06-14 20:14:53 +01:00
1934f143a5
Add suggested fixes for 12 iPad Pro metrics
2016-06-13 12:54:29 -04:00
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
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
dc22fe8191
Add initial support for 12.9 inch iPad Pro
...
Needs feedback on naming and metrics
2016-06-03 15:11:43 -04:00
4259a1cc92
Update pod spec version number.
2016-05-24 10:54:15 -07:00
70d4532d0e
Declare ORKScrollToTopAnimationDuration and ORKCGFloatInvalidValue as extern in ORKHelpers.h; fixes #679
2016-05-24 10:53:53 -07:00
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
8e2313118f
Merge pull request #680 from apbendi/header-fix
...
Fix declaration of constants in ORKHelpers
2016-05-17 11:12:34 -07:00
354cee7e7a
Declare ORKScrollToTopAnimationDuration and ORKCGFloatInvalidValue as extern in ORKHelpers.h; fixes #679
2016-05-12 16:18:20 -04:00
427b1a3aea
Fix a few things that Yuan pointed out from code reviewing the changes.
2016-05-05 19:48:14 -07:00
7cfb8960c9
[ORKHeightPicker] Rename variables in internal method
2016-05-05 01:36:04 +01:00
cabaecb5d1
[ORKHeightAnswerFormat] Use ORK_DECODE_ENUM() and ORK_ENCODE_ENUM()
2016-05-05 01:08:37 +01:00
99bd214f23
[Misc] Rename 'ORKNumberFormatter' to 'ORKDecimalNumberFormatter'
2016-05-05 01:04:07 +01:00
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
75e880e1d9
Merge pull request #653 from samfalconer/master
...
Update ORKSignatureView to support pressure sensitive stroke widths.
2016-05-03 11:07:35 -07:00
711f39eca9
Merge remote-tracking branch 'apple/master'
2016-05-03 17:01:49 +02:00
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
a788e35d25
Merge branch 'ResearchKit/master'
2016-05-02 10:50:32 +01:00
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
b0f5e2cbb7
Merge pull request #650 from dwarfland/master
...
Typo/case fix in #include
2016-04-28 16:38:31 -07:00
2e6643022e
Merge remote-tracking branch 'apple/master'
2016-04-20 15:43:47 +02:00
2c4ef0f73e
Merge pull request #664 from ResearchKit/stable
...
Merge class visibility fix from Stable to Master
2016-04-19 17:12:02 -07:00
23900bed0e
Merge pull request #663 from YuanZhu-apple/stable_class_visibility
...
Fix class visibility
2016-04-19 17:10:44 -07:00
8c8a1adc47
Fix class visibility
2016-04-19 17:05:49 -07:00
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
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
d2f26a5ab9
[ORKTest] Add ORKLineGraphChartView's graphChartView:fillColorForPlotIndex: method test
2016-04-13 19:58:58 +01:00
c170a8c38a
reformat whitespace. refs #658
2016-04-13 10:56:54 -04:00
934aa3283b
allow plot fill color to be set. refs #658
2016-04-13 10:56:47 -04:00
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
5f969da0d7
Adding tap duration to Tapping Task Issue #561
2016-04-06 19:49:58 +02:00
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
44db125626
Merge remote-tracking branch 'apple/master'
2016-03-30 06:45:54 +02:00
42c12ca73f
[ORKHeightAnswerFormat] Replace 'BOOL useMetricSystem' by 'ORKMeasurementSystem measurementSystem'
...
Valid values are:
- ORKMeasurementSystemLocal
- ORKMeasurementSystemMetric
- ORKMeasurementSystemUSC
2016-03-30 00:56:12 +01:00
025581ad55
[ORKHealthKitQuantityTypeAnswerFormat] Use 'ORKHeightAnswerFormat' as the impliedAnswerFormat when the quantity type is 'HKQuantityTypeIdentifierHeight
2016-03-29 21:53:30 +01:00
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
f7ea0167b1
Merge pull request #641 from rsanchezsaez/rsanchezsaez-ORKStepResult.enabledAssistiveTechnology
...
[ORKStepResult] Add 'enabledAssistiveTechnology' property
2016-03-29 12:39:21 -07:00
a5a8531fdf
[ORKStepResult] Rename 'checkEnabledAssistiveTechnology' to 'updateEnabledAssistiveTechnology'
2016-03-29 20:23:58 +01:00
e60db320ed
Merge pull request #645 from rsanchezsaez/rsanchezsaez-ORKCountdownStep
...
[Framework] Expose ORKCountdownStep and ORKCompletionStep publicly
2016-03-29 11:08:23 -07:00
8a6895d762
ORKWaitStepViewController.h was marked as private and thus missing (but needed) from compiled .framework
2016-03-29 11:26:53 -04:00
2ac579a610
Type/case fix in #include
2016-03-29 11:20:57 -04:00
4b9ae8e404
[ORKTest] Fix small indentation misalign
2016-03-29 14:12:14 +01:00
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
9b539d7faf
[Misc] Remove needless #imports from ORKVerticalContainerView
2016-03-28 16:05:34 +01:00
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
c7be2b44ee
Merge remote-tracking branch 'apple/master'
2016-03-28 13:20:22 +02:00
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
da41b8a43b
Merge remote-tracking branch 'ResearchKit/master'
2016-03-26 10:41:03 -07:00
86273181ac
[Framework] Expose ORKCountdownStep and ORKCompletionStep publicly
2016-03-24 17:29:05 +00:00
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
d783c0b2b6
[Cocoapods] Fix podspec to include swift files
2016-03-24 15:23:50 +00:00
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
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
642f87576a
[Misc] Avoid some abbreviations and needless intermediate variables
2016-03-23 17:43:44 +00:00
4735bc5d47
[Misc] Add missing whitespace around '!=' operator
2016-03-22 18:43:59 +00:00
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
daac3505b4
[ORKSample] Small improvement to 40x40 app icon
2016-03-22 12:45:09 +00:00
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
1337dbf851
[ORKDirectionView] Avoid CGMutablePath leak
2016-03-22 12:15:24 +00:00
0c60532068
[ORKTextScaleAnswerFormat] Fix issue potentially causing 'nil' to try to be added to an array
2016-03-22 12:12:07 +00:00
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
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
09b7adc981
[Charts] Make scrubber to be shown on a static long press
...
Adds public UILongPressGestureRecognizer property.
2016-03-18 11:57:03 +00:00
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
9ef8b4a980
[Charts] Make sure ORKBarGraphChartView bars and ORKLineGraphChartView fill start at whole pixel coordinates
2016-03-17 15:47:20 +00:00
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
778bcf71e0
[ORKValueStack] Rename '-initWithStackedValueArray:' to '-initWithStackedValues:' and fix documentation
2016-03-16 18:05:15 +00:00
bf94333d32
[ORKChartTypes] Make 'stackedValues' property to have copy semantics
2016-03-16 17:45:56 +00:00
9f5caad71d
Merge pull request #445 from rsanchezsaez/rsanchezsaez-HomogenousORKTextFieldView
...
[ORKTextField] Coherent placeholder handling
2016-03-16 10:07:20 -07:00
14fce4445f
[Charts] Minor documentation improvements
2016-03-16 16:48:30 +00:00
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
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
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
6e4a4560d8
[Misc] Use property syntax for accessing 'hash'
2016-03-16 14:04:46 +00:00
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
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
28ee60beb7
[Coding Style Guide] Add some whitespace notes, and favor '_Nullable' over '__nullable.
2016-03-16 13:21:02 +00:00
e305e3c4b2
[ORKNavigationContainerView] Use explicit struct initialization
2016-03-16 13:17:03 +00:00
90f5a2cc62
[Misc] Avoid needless returns from void functions
2016-03-16 13:16:58 +00:00
75c75901a3
[Misc] Use __typeof instead of typeof
...
(Avoids pedantic warning)
2016-03-16 13:16:53 +00:00
c5396e8ae6
[ORKHelpers] Remove needless struct casts
2016-03-16 13:16:46 +00:00
942a092bd1
[Misc] Remove extraneous ; symbols
2016-03-16 13:16:41 +00:00
1cb09d68d3
[Charts] Draw reference lines for Bar Graph Chart View on ORKCatalog example
2016-03-15 18:32:25 +00:00
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
878acecad6
[ORKSpatialSpanTargetView] Remove needsless '_' prefix from static variable name
2016-03-15 17:07:20 +00:00
5d1fe51b42
[Coding Style Guide] Add 'Spaces in array and dictionary literals' subsection
2016-03-15 16:31:34 +00:00
077dfcc4ab
[Misc] Additional whitespace homogenization regarding space before dictionary keys and around the tertiary operator (?:)
2016-03-15 16:09:19 +00:00
f24c371541
[Misc] Rename STRONGTYPE() to ORKStrongTypeOf() and introduce ORKWeakTypeOf() for homogeneity
2016-03-15 15:31:26 +00:00
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
887f8dd6bd
[Project] Extract type definitions from 'ORKDefines.h' into the new 'ORKTypes.h' file
2016-03-15 12:42:16 +00:00
f6c8bc939b
[ORKHelpers] Use ORK_INLINE macro
2016-03-15 12:14:44 +00:00
b6cc2f3add
[ORKGraphChartView] Use ORK_INLINE macro
2016-03-15 11:47:36 +00:00
24929ca8b1
[ORKHelpers] Rename STRINGIFY to ORK_STRINGIFY
2016-03-14 15:35:15 +00:00
8c270dca89
[ORKHelpers] Avoid using the reserved '__' prefix
2016-03-14 15:31:56 +00:00
129ee6baef
[ORKKeychainWrapper]: Use '_Nullable' instead of '__nullable' (Xcode 7 style)
2016-03-14 15:23:26 +00:00
a2e4b5aa1c
[Misc] Always add space before '__autoreleasing'
2016-03-14 15:22:15 +00:00
75047cabb2
[ORKHolePegTest] Replace 'can not' by 'cannot' in exception messages
2016-03-14 15:09:58 +00:00
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
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
b13a470348
Merge branch 'ResearchKit/master'
2016-03-11 12:45:54 +00:00
2ea828e29e
[ORKBarGraphChartView] Made BarWidth constant static
2016-03-11 11:56:08 +00:00
7efb9ecb36
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKBarGraphChart
2016-03-10 18:10:44 +00:00
ea777873af
[Charts] Make 'ORKValueRange' and 'ORKValueStack' to use 'double' instead of 'CGFloat'
2016-03-10 17:58:46 +00:00
fc7c55c3ab
[ORKValueRange] Raname 'isEmpty' property to 'isEmptyRange'
2016-03-10 17:24:13 +00:00
df05877256
[Charts] Rename 'ORKFloatRange' and 'ORKFloatStack' to 'ORKValueRange' and 'ORKValueStack'
2016-03-10 17:20:13 +00:00
9025045a4c
[Charts] Add sample graph chart data source for Interface Builder
2016-03-10 15:47:14 +01:00
0571b6e960
[Charts] Add sample pie chart data source for Interface Builder
2016-03-10 15:01:09 +01:00
d1fbc178a1
Merge pull request #591 from rsanchezsaez/rsanchezsaez-master-ORKSampleIcon
...
[ORKSample] Add app icon
2016-03-09 16:12:08 -08:00
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
cc352493f9
Merge pull request #626 from weijentu/master
...
About ORKQuestionType for ORKTextAnswerFormat?
2016-03-09 11:00:42 -08:00
43a4379c8e
Merge pull request #621 from pra85/patch-1
...
[RELEASE-NOTES.md] Fix a typo
2016-03-09 10:30:43 -08:00
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
0980410b95
[ORKFloatRange] Throw exception if 'maximumValue' is lower than 'minimumValue
2016-03-08 18:05:42 +00:00
2e5d784608
[ORKFloatStack] Add comma before the 'and' separator
2016-03-08 17:56:15 +00:00
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
cc46125c69
[ORKFloatStack] Implement accessibilityLabel method
...
(Used by Voice Over)
2016-03-08 17:48:37 +00:00
ca94aa7468
[ORKChartTypes] Conform ORKFloatRange and ORKFloatStack descriptions to ObjC conventions
2016-03-08 17:46:09 +00:00
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
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
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
3f89fba2cf
[Charts] Implement first steps for ORKBarGraphChartView
...
Also, makes ORKTest's 'ORKDiscreteGraphChartView' tests more comprehensive.
2016-03-01 17:14:55 +00:00
bece29b351
[ORKGraphChartView] Fix global appearance proxy tintColor taking over custom local tintColor
2016-03-01 16:02:43 +00:00
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
80d7685ab3
Merge remote-tracking branch 'ResearchKit/master'
2016-02-26 21:43:36 +08:00
6e1334a2fc
Make chart and graph IBDesignable
2016-02-26 14:39:16 +01:00
3c550b54b4
Fix IBInspectable for readonly properties
2016-02-26 14:13:38 +01:00
7ca7079522
Make chart and graph properties IBInspectable
2016-02-26 10:49:19 +01:00
e4af7fe7fe
[RELEASE-NOTES.md] Fix a typo
...
Remove extra `the`
2016-02-18 13:07:24 +05:30
8c3b5ce81f
Update delegate method documentation
2016-02-17 17:27:34 -08:00
783ad4c6b4
Adds support for drawing plots within a chart without individual data point indicators
2016-02-17 17:17:40 -08:00
b85182b372
Fix typos
2016-02-12 12:27:58 -08:00
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
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
182960a263
[ORKGraphChartView] Fix small documentation issues
2016-02-08 18:24:51 +00:00
0971ef71f4
[ORKSample] Fix typos in variable names
2016-02-08 17:52:46 +00:00
92ca8f86a5
[ORKGraphChartView] Fix error in accessibility string key
2016-02-08 17:50:45 +00:00
24c46898e8
[ORKLineGraphChartView] Go back to consistently using minimumValue as main plotted data
2016-02-08 16:40:34 +00:00
065a02eff1
[ORKNavigableOrderedTask] Fix 'shouldReportProgress' being ignored by NSSecureCoding and NSCopying
...
Also, fix ORKTest's unit tests.
2016-02-08 16:33:22 +00:00
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
f6cb8b09f0
[ORKGraphChartView] Make the discrete graph to snap on the actual chosen plot index when scrubbing
2016-02-07 18:51:06 +00:00
f9d49594fe
[ORKGraphVhartView] Fix scrubber not being correctly positioned for last data point in discrete graphs
2016-02-07 15:41:07 +00:00
62a31b087a
Merge pull request #618 from rsanchezsaez/rsanchezsaez-ReleaseNotes
...
[RELEASE-NOTES.md] Improvements
2016-02-05 12:27:31 -08:00
70fd57488d
[RELEASE-NOTES.md] Fix some typos, rewrite some sentences and improve formatting
2016-02-05 18:29:06 +00:00
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
729247cfcd
Allow user to opt-in to linear progress reporting on ORKNavigableOrderedTask
2016-01-29 10:50:25 -05:00
218b8af66a
Merge pull request #604 from rsanchezsaez/rsanchezsaez-ORKTestTests
...
[ORKTestTests] Fix unit tests
2016-01-27 14:21:42 -08:00
069c388cb3
[ORKTest] Remove README.md from target
2016-01-27 19:34:13 +00:00
e199db13b4
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKTestTests
2016-01-27 19:30:50 +00:00
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
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
a1d29fe225
Merge pull request #612 from CareEvolution/ORKWaitStepView-header-fix
...
Revert ORKWaitStepView.h to Project visibility
2016-01-26 11:32:03 -08:00
67bcc93947
Remove Private attribute from internal headers
2016-01-26 11:29:18 -08:00
8e8fabf79f
Merge pull request #605 from rsanchezsaez/rsanchezsaez-ORKStepNavigationRule
...
[ORKStepNavigationRule] Improve documentation
2016-01-26 11:27:30 -08:00
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
2f1e58e234
Revert ORKWaitStepView.h to Project visibility
2016-01-26 08:47:41 -08:00
86226e9ba8
Remove noDataLabel when no data
...
Fix simple logic error
2016-01-26 08:37:13 -08:00
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
525f2c6efb
Merge branch 'master' of https://github.com/ResearchKit/ResearchKit
2016-01-22 13:20:39 -08:00
a4777c8a42
Merge remote-tracking branch 'apple/master'
2016-01-17 11:34:26 +01:00
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
8d0fd95ad0
[ORKTestTests] Fix failing tests (mainly due ORKReviewStep)
2016-01-16 21:36:55 +00:00
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
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
f325310d77
Merge pull request #451 from rsanchezsaez/rsanchezsaez-documentationformatting
...
README.md formatting
2016-01-14 16:11:13 -08:00
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
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
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
c570771b4d
[ORKGraphChartView] Avoid crash when displaying a graph with no dataSource set
2016-01-14 21:55:50 +00:00
00ff2f3402
[ORKSample] Allow onboarding to proceed on the Simulator despite the lack of HealthKit
2016-01-14 21:15:59 +00:00
407de8ed11
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-HomogeneousORKTextFieldView
2016-01-14 20:59:10 +00:00
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
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
8c86b8d80d
Merge pull request #463 from oliverschaefer/master
...
Review Step: API Design v1.2
2016-01-13 17:14:58 -08:00
7ceda4a9c3
PR updates
2016-01-12 17:23:12 +01:00
21c89256fa
Merge remote-tracking branch 'apple/master'
2016-01-12 17:19:49 +01:00
62ae57bb11
Merge branch 'master' into feature/passcode-override
2016-01-12 14:20:38 +01:00
fbc4191081
Merge pull request #599 from ResearchKit/stable
...
Merge `Stable` into `Master`
2016-01-11 15:50:58 -08:00
429c3c9886
Update the versioning and pod spec
2016-01-11 15:20:01 -08:00
4228cf46c6
Merge pull request #598 from YuanZhu-apple/convergence_batch2
...
Doc updates and other fixes for convergence
2016-01-11 11:25:46 -08:00
674e06cebc
Merge pull request #597 from evliu/master
...
Samples - ORKCatalog/Charts/ChartListViewController - set prop on dis…
2016-01-08 13:17:32 -08:00
ce31ebd366
Merge branch 'releaseNotes' into 'convergence'
...
Release notes
See merge request !35
2016-01-08 12:17:11 -08:00
135ec4a3f2
Minor edits.
2016-01-08 12:10:56 -08:00
a30119aa0d
Merge branch 'convergence_active_task_should_resume_properly' into 'convergence'
...
Convergence active task should resume properly
Fix for <rdar://problem/24095971> ResearchKit: progress for 2 finger tapping stopped after the passcode auth.
Stop using background delivery in health recorder.
See merge request !37
2016-01-07 16:12:36 -08:00
31526c6664
Disable background delivery in health recorder.
2016-01-07 15:29:59 -08:00
e5ac62f298
Fix for progress for 2 finger tapping stopped after the passcode auth
2016-01-07 15:29:21 -08:00
ade7f99010
Samples - ORKCatalog/Charts/ChartListViewController - set prop on discreteGraphChartView instead of lineGraphChartView
2016-01-07 13:29:27 -08:00
bb1be965a2
Merge branch 'convergence_incorporate_documentation' into 'convergence'
...
Convergence incorporate documentation
Incorporate documentation update from devpubs.
See merge request !36
2016-01-06 17:42:42 -08:00
3fb266139e
More doc update.
2016-01-06 13:59:38 -08:00
0b2216c6cf
Update for review.
2016-01-06 13:56:39 -08:00
c90d8c7fbd
One more merge conflict
2016-01-06 11:06:09 -08:00
3cb705c123
Fix appledoc warnings
2016-01-06 11:03:26 -08:00
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
f24a74006a
PR updates
2016-01-06 13:27:38 +01:00
040b9d2220
Merge remote-tracking branch 'apple/master'
2016-01-06 13:18:34 +01:00
2e1749a14d
alert controller bugfixes
2016-01-06 13:09:30 +01:00
1817398f61
Merge branch 'convergence' into convergence_incorporate_documentation
...
Conflicts:
ResearchKit/Charts/ORKGraphChartView.h
ResearchKit/Common/ORKAnswerFormat.h
ResearchKit/Common/ORKDefines.h
ResearchKit/Common/ORKNavigableOrderedTask.h
ResearchKit/Common/ORKResult.h
ResearchKit/Common/ORKResultPredicate.h
ResearchKit/Consent/ORKConsentReviewController.m
2016-01-05 23:18:21 -08:00
b542c46189
Formatting fixes.
2016-01-05 18:36:46 -08:00
b6cc636975
Minor fixes.
2016-01-05 18:30:24 -08:00
1844a0774c
Added Sample App info.
2016-01-05 18:29:27 -08:00
6a1343622d
Update charts documentation.
2016-01-05 18:00:56 -08:00
a3b45b6268
Merge branch 'convergence' of https://github.com/ResearchKit/ResearchKit into convergence
2016-01-05 16:34:20 -08:00
204d5dbf40
Merge pull request #595 from rsanchezsaez/rsanchezsaez-ORKOrderedTask
...
[ORKOrderedTask] Validate step identifier uniqueness on init
2016-01-05 16:17:59 -08:00
f076b69a98
Merge pull request #594 from rsanchezsaez/rsanchezsaez-convergence-ORKGraphChartView
...
[ORKGraphChartView] Fix wrong selector check on accessibility (convergence)
2016-01-05 16:15:25 -08:00
908b9cb713
Merge pull request #593 from rsanchezsaez/rsanchezsaez-ORKGraphChartView
...
[ORKGraphChartView] Fix wrong selector check on accessibility
2016-01-05 16:14:23 -08:00
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
39e17e7867
Added RK 1.3 notes.
2016-01-05 14:52:53 -08:00
66fa232ca7
PR updates
2016-01-05 17:09:44 +01:00
75ad7512b8
Merge branch 'master' of github.com:ResearchKit/ResearchKit
2016-01-05 10:46:51 +01:00
8b521477dd
[docs] Fix some headerdoc warnings
2016-01-05 03:05:42 +00:00
d60c81b004
[docs] Remove extraneous line from the Programming Guide
2016-01-05 02:52:22 +00:00
a44f2db8fd
[ORKOrderedTask] Validate step identifier uniqueness on init
2016-01-05 02:32:56 +00:00
663426250f
[ORKGraphChartView] Fix wrong selector check on accessibility
2016-01-05 02:27:50 +00:00
58d377d9ab
[ORKGraphChartView] Fix wrong selector check on accessibility
2016-01-05 02:24:52 +00:00
e56bf7d217
[ORKChoiceAnswerFormatHelper] Relax class checking so choice answer formats can be subclassed
2016-01-05 01:49:17 +00:00
28ff1415dd
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-documentationformatting
...
# Conflicts:
# README.md
2016-01-05 00:19:28 +00:00
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
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
44ee48fa54
ORKTextField: Hide placeholder when editing a field which has a suffix
2016-01-04 23:00:18 +00:00
b704be75b5
ORKAnswerTextView: fix comment typo
2016-01-04 22:30:54 +00:00
4048e34530
ORKAnswerTextFieldView: fix whitespace
2016-01-04 22:30:13 +00:00
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
1b266c3652
ORKTextFieldView: conform to naming and whitespacing conventions
2016-01-04 22:23:58 +00:00
8ab052577d
ORKTextFieldView: fix active unit color being off when there's no placeholder
2016-01-04 21:58:51 +00:00
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
d39a72e535
ORKTextField: reduce left paddingGuess
2016-01-04 21:58:13 +00:00
135e2209c8
ORKTextFieldView: whitespace
2016-01-04 21:58:07 +00:00
b865da3a75
ORKTextFieldView: make placeholder behave like 'UITextFieldView' placeholder
...
# Conflicts:
# ResearchKit/Common/ORKTextFieldView.m
2016-01-04 21:57:53 +00:00
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
cc45d92266
[ORKSample] Add app icon
2016-01-04 20:00:33 +00:00
197eb8422a
Merge branch 'convergence_fix_responder_check' into 'convergence'
...
Fix "ORKGraphChartView checks wrong delegate method for respondsToSelector"
Use the correct `respondsToSelector:` checking.
This is an issue reported by https://github.com/ResearchKit/ResearchKit/issues/589
See merge request !34
2016-01-04 11:53:14 -08:00
fe10cd8a71
Merge branch 'convergence' of https://github.com/ResearchKit/ResearchKit into convergence
2016-01-04 11:40:16 -08:00
63dfad2b0d
Merge pull request #590 from rsanchezsaez/rsanchezsaez-convergence-ORKSampleFix
...
ORKSample fixes
2016-01-04 11:39:36 -08:00
886605e013
Use the correct respondsToSelector: checking
2016-01-04 10:43:49 -08:00
1619428bb0
Accessibility updates
2015-12-29 22:07:22 +01:00
3ae773049a
PR updates
2015-12-29 12:20:54 +01:00
76eb4f97d9
Merge remote-tracking branch 'apple/master'
2015-12-28 17:45:52 +01:00
4c0a4a1e51
[ORKSample] Fix project
...
- Add ResearchKit as an embed framework (otherwise it won't run on the device)
- Remove extraneous Development Team
2015-12-23 20:38:24 +00:00
12326634db
Spaces instead of tabs
2015-12-23 17:30:06 +01:00
36b90b813c
Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into feature/passcode-override
2015-12-23 17:28:41 +01:00
22b769b786
Merge pull request #588 from YuanZhu-apple/convergence_merge_master
...
Merge convergence code into master
2015-12-22 14:21:49 -08:00
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
aa2b1f9e61
Merge pull request #587 from YuanZhu-apple/convergence_batch
...
Convergence patch
2015-12-22 12:35:23 -08:00
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
f6fd29087b
Use instancetype instead of id
2015-12-18 10:48:32 +01:00
4517cd445e
Merge branch 'master' of github.com:ResearchKit/ResearchKit
2015-12-18 09:38:50 +01:00
d151e11004
Merge branch 'ResearchKit/master'
2015-12-17 23:23:09 +00:00
fed9fb9ce6
Merge branch 'convergence_fix_progress_is_missing_on_first_step' into 'convergence'
...
Fix task progress is missing on first step.
Fix for <rdar://problem/23940893> Question form does not show "1 of 6" progress at the top when the modal is displayed
Since we pulled `currentStepViewController` into `shouldDisplayProgressLabel`, we also need to move progressLabel generation after `currentStepViewController` has been assigned.
Today's `shouldDisplayProgressLabel`:
```
- (BOOL)shouldDisplayProgressLabel {
return self.showsProgressInNavigationBar && [_task respondsToSelector:@selector(progressOfCurrentStep:withResult:)] && self.currentStepViewController.step.showsProgress;
}
```
See merge request !33
2015-12-17 13:47:00 -08:00
6a786cfb37
Fix task progress is missing on first step.
2015-12-17 13:27:39 -08:00
39d76c8ed6
Merge branch 'convergence_fix_orksample_dependency' into 'convergence'
...
Add RK as ORKSample's dependency.
See merge request !31
2015-12-16 16:05:26 -08:00
ec9b1c9108
Change regex api to accept NSRegularExpression.
2015-12-16 15:56:28 -08:00
7059bd39a6
Add RK as ORKSample's dependency.
2015-12-16 14:52:28 -08:00
dddc633e3a
Merge branch 'convergence_ax_wait_step' into 'convergence'
...
AX for wait step
From Ryan, even through `UIProgressView` is not accessible.
See merge request !30
2015-12-16 11:18:36 -08:00
9e358e7fc5
Merge branch 'convergence_fix_catalog_after_verification_step_change' into 'convergence'
...
API changed after verification step update, need to update ORKCatalog as well.
See merge request !29
2015-12-16 11:10:45 -08:00
0aacde2057
AX for wait step
2015-12-16 10:59:56 -08:00
5bdd973315
Fix unit tests.
2015-12-16 10:30:09 -08:00
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
4342caae71
Updated in response to code review.
2015-12-15 18:10:26 -08:00
cb4514328e
API changed after verification step update, need to update ORKCatalog as well.
2015-12-15 17:49:33 -08:00
84710f773f
Merge branch 'convergence_update_pod_spec' into 'convergence'
...
Update pod spec to include `swift` files
According to
https://github.com/ResearchKit/ResearchKit/pull/383#issuecomment-161036351
See merge request !28
2015-12-15 16:54:04 -08:00
42005af39c
Update pod spec to include swift files
...
According to
https://github.com/ResearchKit/ResearchKit/pull/383#issuecomment-161036351
2015-12-15 16:51:46 -08:00
f7d7355c49
Added method to create a copy of a step with a new identifier
2015-12-15 14:48:38 -08:00
9c847f8fe6
Merge branch 'passcodeIcon' into 'convergence'
...
Adding app icon to ORKPasscodeStep.
See merge request !27
2015-12-15 13:06:06 -08:00
aac584b2f1
Resolving merge conflicts.
2015-12-15 11:05:09 -08:00
4be283e888
Localization strings update.
2015-12-14 17:36:31 -08:00
4d37142873
Merge branch 'convergence_new_sample_app' into 'convergence'
...
Checkin the new sample app
New app was added as `ORKSample` under `samples` folder.
See merge request !23
2015-12-14 17:06:30 -08:00
08b48589da
Added new metric for icon on vertical container view to support iPad.
2015-12-14 17:04:34 -08:00
6ba85a1504
Merge branch 'convergence_accessibility_fix_value_picker' into 'convergence'
...
Accessibility fix value picker
R=me.
From Ryan:
This next issue is with VoiceOver speaking the wrong words when changing ORKValuePicker’s value. Ultimately, we need to fix this on our side:
<rdar://problem/23885294> UITextField AX broken when connected as the firstResponder to a UIPicker.
I have attached a workaround patch to rdar://problem/23710698. The problem is that when we change the value of the picker and a text field is the firstResponder, VoiceOver thinks this is a selection changed event and reads the delta change. For example, going from Male to Female, the delta is “LE.” The workaround is, since this textfield is not editable, to keep the selectedTextRange as 0,0 so that VO doesn’t do the selection changed behavior.
Please let me know if you have any questions!
See merge request !26
2015-12-14 16:54:18 -08:00
5fc4316e22
Auto deselect selected cell on profile page.
2015-12-14 16:54:18 -08:00
287dcd979c
Merge branch 'verificationRedesign' into 'convergence'
...
Verification Step redesign.
Verification step redesign as per HI.
See merge request !20
2015-12-14 16:47:48 -08:00
29f2d16676
Adding app icon to ORKPasscodeStep.
2015-12-14 16:46:33 -08:00
b022ae3589
Limit minimum date in answer format to current time.
2015-12-14 16:46:02 -08:00
76bbbbe604
Delegate callback refactor for keyboard on ORKPasscodeStepViewController.
2015-12-14 16:40:32 -08:00
a322f0b17f
Minor refactor.
2015-12-14 16:32:55 -08:00
f11d17752f
Accessibility fix value picker
...
From Ryan:
This next issue is with VoiceOver speaking the wrong words when changing ORKValuePicker’s value. Ultimately, we need to fix this on our side:
<rdar://problem/23885294> UITextField AX broken when connected as the firstResponder to a UIPicker.
I have attached a workaround patch to rdar://problem/23710698. The problem is that when we change the value of the picker and a text field is the firstResponder, VoiceOver thinks this is a selection changed event and reads the delta change. For example, going from Male to Female, the delta is “LE.” The workaround is, since this textfield is not editable, to keep the selectedTextRange as 0,0 so that VO doesn’t do the selection changed behavior.
Please let me know if you have any questions!
2015-12-14 14:32:10 -08:00
14a815d63e
Merge branch 'convergence_fix_merge_crash_bug' into 'convergence'
...
The `break` was in wrong place which let `confirmAnswerFormat` use a `scaleCell` instead.
It is used to crash `registration test`.
See merge request !25
2015-12-14 14:18:09 -08:00
1b4b0166b8
The break was in wrong place which let confirmAnswerFormat use a scaleCell instead.
2015-12-14 14:13:01 -08:00
669269fd45
Merge branch 'convergence_full_length_seperator_line' into 'convergence'
...
Apply full width section separator on from/question page (including location question)
See merge request !22
2015-12-11 16:01:59 -08:00
3f7c1d15d5
Checkin the new sample app
2015-12-11 15:46:30 -08:00
ca136a9ce1
Merge branch 'convergence' of gitlab.sd.apple.com:y_zhu/GitHub-ResearchKit-Fork into convergence_full_length_seperator_line
...
Conflicts:
ResearchKit/Common/ORKFormStepViewController.m
2015-12-11 14:11:29 -08:00
fe2ea1e3d8
Merge branch 'eligFix' into 'convergence'
...
Removed eligibility module.
As per HI, the eligibility module should re-use the text choice answer format look and feel. This PR removes the current `ORKEligbilityAnswerFormat` and updates `ORKTest` and `ORKCatalog` examples of eligibility using `ORKTextChoiceAnswerFormat`.
See merge request !17
2015-12-11 13:30:50 -08:00
eedcff0ab0
Merge branch 'passcodeFix' into 'convergence'
...
Passcode keyboard orientation fix.
The orientation for the passcode step was not being registered from `supportedInterfaceOrientations`, so this fix forwards that instance method to a class method of the same name to retrieve the value. This allows the Task View Controller to retrieve the values before the class is initialized.
See merge request !16
2015-12-11 13:24:28 -08:00
00bd267c1b
Apply full width section separator on from/question page (including location question)
2015-12-10 17:52:28 -08:00
d9c005aa18
Refactored eligibility survey also.
2015-12-10 16:40:27 -08:00
be02e1a22a
Refactored eligibility task.
2015-12-10 16:38:59 -08:00
b474f6f12d
Added additional documentation.
2015-12-10 14:45:33 -08:00
bc263d92af
Merge branch 'convergence_accessibility_fix_for_account_creation' into 'convergence'
...
Accessibility fix for password field
<rdar://problem/23829496> RK Accessibility Account creation control issues
I looked, it is good to me.
See merge request !21
2015-12-10 13:13:39 -08:00
0575f21c3e
Accessibility fix for password field: <rdar://problem/23829496> RK Accessibility: Account creation control issues
2015-12-09 17:58:57 -08:00
88543a14d6
Verification Step redesign.
2015-12-09 17:11:35 -08:00
cd8a801738
Merge branch 'verificationRedesign' into 'convergence'
...
Added new strings for verification step and removed old strings.
See merge request !19
2015-12-09 15:04:26 -08:00
30af7f46f7
Merge branch 'convergence_new_icon_from_hi' into 'convergence'
...
Use the new icon for ORKTest app
See merge request !18
2015-12-09 14:59:46 -08:00
1e889ad7dc
Added new strings for verification step and removed old strings.
2015-12-09 14:58:06 -08:00
839c8eca53
Removed class method forwarding.
2015-12-09 14:40:14 -08:00
48ed4b3771
Use the new icon for ORKTest app
2015-12-09 14:23:07 -08:00
e6f4c1deb8
Merge branch 'convergence_peg_test_missing_spoken_instruction_on_last_step' into 'convergence'
...
All other three of four testing steps has spoken instruction.
For <rdar://problem/23778535> [Clout]: US: RedRiver7M1453: No VoiceOver speaks at the Page of 'Put the peg behind the line using your left hand.'
See merge request !13
2015-12-09 12:47:24 -08:00
ae2bff43fa
Merge branch 'convergence_support_multiline_in_form_header' into 'convergence'
...
Wrap text in form header view if the text is long.
Wrap text in form header view if the text is long.
See merge request !14
2015-12-09 12:45:53 -08:00
14260e0df1
Merge branch 'convergence_add_icon_for_ipad_pro' into 'convergence'
...
Add app icons for iPad pro
See merge request !15
2015-12-09 12:40:06 -08:00
4153702c2d
Removed eligibility answer format, survey cell, form item cell, and implementations from ORKTest and ORKCatalog.
2015-12-09 12:08:34 -08:00
a9494ce5d8
Passcode keyboard orientation fix.
2015-12-09 11:04:13 -08:00
0b06d4c18a
Add app icons for iPad pro
2015-12-09 10:41:22 -08:00
2b6d1fcab9
Wrap text in form header view if the text is long.
2015-12-08 17:59:25 -08:00
610ce5aefd
Merge remote-tracking branch 'apple/master'
2015-12-08 22:01:56 +01:00
bd52a14196
Minor PR updates
2015-12-08 22:01:44 +01:00
eb52acefa9
All other three of four testing steps has spoken instruction.
2015-12-08 12:55:14 -08:00
423a89c879
Merge branch 'master' of github.com:ResearchKit/ResearchKit
2015-12-07 16:51:07 -05:00
e444086399
PR updates
2015-12-06 13:13:33 +01:00
82de8783bd
Merge branch 'convergence_fix_wait_step_progessview_size' into 'convergence'
...
Fix the size of progress view in wait step.
Also documented the view hierarchy of ORKVerticalContainerView
See reopened radar:
<rdar://problem/23638006> ResearchKit: updateText of ORKWaitStepViewController does not work as expected
See merge request !12
2015-12-04 16:39:52 -08:00
0dea3dd673
Localization strings update
2015-12-04 13:51:39 -08:00
6f4c072f93
Fix the size of progress view in wait step.
...
Also documented the view hierarchy of ORKVerticalContainerView
2015-12-04 12:17:13 -08:00
0ed1df3945
PR changes
2015-12-04 13:36:38 +01:00
fee0d2d7b6
Merge branch 'regexFix' into 'convergence'
...
Added validation checking for Text Survey Cell.
Currently, text validation from ORKTextAnswerFormat is only applied to ORKFormItemCell.
This patch adds the validation checking to ORKSurveyAnswerCellForText.
This is in response to a radar generated by QA.
radar://23695918
See merge request !9
2015-12-03 13:26:55 -08:00
d71ab9538c
PR updates
2015-12-03 22:08:37 +01:00
7caaf525e3
PR updates
2015-12-03 13:05:22 +01:00
610a1fd93f
Minor fix.
2015-12-02 16:05:44 -08:00
36bda05556
Merge branch 'convergence_ax_scale_question_fix' into 'convergence'
...
Fix for <rdar://problem/23710807> RK Accessibility: Scale Question
`swipe up` by passed the normal `touch to assign value` process, thus, set `showThumb = YES;` is required.
From Ryan:
1. Tap the slider
(No value is read)
(VoiceOver cursor is moved to the slider element)
2. Swipe up to increment the value (i.e. calls accessibilityIncrement which calls axBumpValue)
Expected Behavior:
Now that we incremented the slider, it has a value and should be spoken.
Actual Behavior:
No value is spoken.
(In the debugger, I can see showThumb is NO, thus we don’t speak an accessibilityValue).
Conclusion:
It seems to me once you made a change to the slider’s value (via accessibilityIncrement or accessibilityDecrement), showThumb should become YES.
See merge request !11
2015-12-02 16:03:43 -08:00
069ea16731
Merge branch 'passcodeFix' into 'convergence'
...
Locked Passcode View Controllers to portrait only.
The Passcode View Controllers truncate the passcode text field in landscape mode.
To avoid this problem, this PR locks the passcode view controller orientation to portrait only.
This solves the stated problem and provides a more intuitive UI for passcode entry.
This is in response to the radar generated by QA.
radar://23713589
See merge request !10
2015-12-02 15:35:22 -08:00
a1ed3ea711
Refactored continue button logic and removed validation logic from textfield delegate.
2015-12-02 15:27:12 -08:00
d910062bb9
Merge branch 'dobFix' into 'convergence'
...
Add current date to maximum date for ORKRegistrationStep's dob answer format.
See merge request !7
2015-12-02 14:57:02 -08:00
ba5d80c6c1
Fix for <rdar://problem/23710807> RK Accessibility: Scale Question
...
`swipe up` by passed the normal `touch to assign value` process, thus, set `showThumb = YES;` is required.
From Ryan:
1. Tap the slider
(No value is read)
(VoiceOver cursor is moved to the slider element)
2. Swipe up to increment the value (i.e. calls accessibilityIncrement which calls axBumpValue)
Expected Behavior:
Now that we incremented the slider, it has a value and should be spoken.
Actual Behavior:
No value is spoken.
(In the debugger, I can see showThumb is NO, thus we don’t speak an accessibilityValue).
Conclusion:
It seems to me once you made a change to the slider’s value (via accessibilityIncrement or accessibilityDecrement), showThumb should become YES.
2015-12-02 14:38:54 -08:00
21ada70ae4
Locked Passcode View Controllers to portrait only.
2015-12-02 14:28:53 -08:00
9be3f057be
Added validation checking for Text Survey Cell.
2015-12-02 13:43:02 -08:00
51c23ccf17
Changed dispatch_once to an ivar.
2015-12-01 16:20:22 -08:00
113b7422a0
Added additional initializer.
2015-12-01 16:09:08 -08:00
c852c62262
Added static, updated formItems to generate today's date for maximumDate, and fixed serialization issues.
2015-12-01 15:50:52 -08:00
c27b784870
Merge branch 'convergence' of https://github.com/ResearchKit/ResearchKit into convergence
2015-12-01 15:31:58 -08:00
c3102d6183
Merge branch 'convergence'
2015-12-01 15:31:04 -08:00
2510bc7f97
Correct Destionation
...
Changed all instances of Destionation to Destination
2015-12-01 15:30:04 -08:00
de7860b60a
Allow ORKLoginStepViewController to be subclassed by making the class symbol visible
2015-12-01 15:28:35 -08:00
37c65bdc55
Merge branch 'convergence' of https://github.com/ResearchKit/ResearchKit into convergence
2015-12-01 14:40:52 -08:00
4fe13d0b27
Minor refactor.
2015-12-01 13:29:29 -08:00
853d4384fd
Refactored registration form items generation.
2015-12-01 13:16:43 -08:00
f9669508dc
Merge branch 'tappingResultBugFix' into 'convergence'
...
Tapping sample result bug fix.
See merge request !8
2015-12-01 10:29:32 -08:00
e1ea72b861
Tapping sample result bug fix.
2015-11-30 17:58:46 -08:00
1cf445af09
Add current date to maximum date for ORKRegistrationStep's dob answer format.
2015-11-30 14:03:53 -08:00
fc1c328b68
localized strings update on convergence branch.
2015-11-30 13:26:47 -08:00
7b7a851cca
Merge branch 'convergence_fix_pie_chart_label_overlap' into 'convergence'
...
Fix issue https://github.com/ResearchKit/ResearchKit/issues/558
Corrected the calculation inside `ORKCenteredCollectionViewLayout`
To test, update `ChartDataSources.swift`'s `pieChartView` method to be like this:
```
func pieChartView(pieChartView: ORKPieChartView, titleForSegmentAtIndex index: Int) -> String {
switch index {
case 0:
return "Steps"
case 1:
return "Tasks"
case 2:
return "Surveys completed"
default:
return "test"
}
}
```
After this fix:
See merge request !3
2015-11-30 13:16:44 -08:00
37ac134b5e
Merge branch 'convergence_change_activity_indicator' into 'convergence'
...
Change to use system activity indicator in wait step.
See merge request !5
2015-11-30 13:16:21 -08:00
067f8f8e3d
Merge branch 'convergence_add_ORKWaitStepViewController_to_RK.h' into 'convergence'
...
Make WaitStepVC public and add it to `ResearchKit.h`
This is a fix for `<rdar://problem/23621910> ResearchKit: ORKWaitStepViewController.h is not included in the <ResearchKit/ResearchKit.h>`
See merge request !4
2015-11-30 13:13:25 -08:00
7d30dd09f3
Merge branch 'convergence_loc_two_lines' into 'convergence'
...
Fix for rdar://problem/23574379 [Clout]: RS: RedRiver7M1408: Clipping string…
Make buttons and labels multilines.
See merge request !2
2015-11-30 12:55:28 -08:00
73495244be
PR change
2015-11-30 21:31:52 +01:00
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
81c8c10ebc
Fixed build error in ResultTableViewProviders.swift caused by an outdated property.
2015-11-24 20:12:48 -05:00
19921baf55
Merge pull request #569 from shazino/convergence
...
Fix PSAT progress indicator tint color.
2015-11-23 14:24:36 -08:00
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
8fa839a66b
Allow ORKLoginStepViewController to be subclassed by making the class symbol visible
2015-11-23 14:02:47 -05:00
ffd8552aa8
Fix PSAT progress indicator tint color.
2015-11-21 11:48:42 +01:00
140e1ebae0
Fix for rdar://problem/23638006 ResearchKit: updateText of ORKWaitStepViewController does not work as expected
2015-11-20 17:33:05 -08:00
9338ea8b59
Use RK native layout instead of custom layout.
2015-11-20 16:15:33 -08:00
63d56e44f8
Change to use system activity indicator in wait step.
2015-11-20 15:22:23 -08:00
24a03d6ecf
Expose NSRegularExpressionOptions for ORKTextAnswerFormat and via a transparent property in ORKRegistrationStep
2015-11-20 14:31:11 -05:00
3daf9484c4
Make WaitStepVC public and add it to ResearchKit.h
2015-11-20 11:21:26 -08:00
d87372923b
Fix issue https://github.com/ResearchKit/ResearchKit/issues/558
...
Corrected the calculation inside `ORKCenteredCollectionViewLayout`
2015-11-19 17:58:53 -08:00
3dccc6d438
Fix radar <rdar://problem/23574379> [Clout]: RS: RedRiver7M1408: Clipping string RESEND_EMAIL_BUTTON_TITLE.
...
Make buttons and labels multiline.
2015-11-19 14:32:03 -08:00
f8a77a1b1e
Read only message
2015-11-19 20:24:11 +01:00
ddc0016bd1
Disable skip button
2015-11-19 20:00:57 +01:00
50cf8171f5
Change english string for "LOCATION_ERROR_TITLE"
2015-11-18 17:03:23 -08:00
d2c51201ef
Strings update 2nd round
2015-11-18 15:53:49 -08:00
8a320f0b72
Use seperate string for left and right hand.
2015-11-18 14:03:54 -08:00
8b81a8c5f1
Merge remote-tracking branch 'apple/master'
2015-11-18 22:55:22 +01:00
ff673f0ad4
Fixed header comment typos
2015-11-18 22:50:03 +01:00
116a8e08ad
Changed animation direction
2015-11-18 22:40:24 +01:00
2988cb0fa6
Change circle to peg
2015-11-18 13:07:34 -08:00
59788e53ec
change the string of "PASSCODE_INVALID_ALERT_TITLE"
2015-11-18 10:52:31 -08:00
09e717c69f
Merge pull request #564 from md0u80c9/CorrectDestionation
...
CorrectDestionation
2015-11-18 10:34:49 -08:00
9b1bdd390c
PR changes, added documentation
2015-11-18 15:28:23 +01:00
af823d1f63
Change WiFi to Wi-Fi
2015-11-17 18:09:59 -08:00
75ac5d3366
Fix typo.
2015-11-17 17:50:56 -08:00
b113ef0ee3
PR updates
2015-11-17 21:52:23 +01:00
8e49cbc733
Correct Destionation
...
Changed all instances of Destionation to Destination
2015-11-17 13:47:25 +00:00
37cfadf81a
Merge branch 'ResearchKit/master'
2015-11-16 22:29:18 +00:00
932024c4af
Loc en string fixes
2015-11-13 15:16:15 -08:00
26cf7e4d64
add ORK_CLASS_AVAILABLE for ORKLoginStepViewController
2015-11-13 15:12:24 -08:00
fa2b18da42
1st round localization
2015-11-13 12:52:07 -08:00
fb778eefcf
Bug fix
2015-11-13 09:41:25 +01:00
f384f9137d
Bug fixes
2015-11-12 22:24:12 +01:00
2f19a3e089
PR updates, bug fix
2015-11-12 21:44:04 +01:00
b112945365
PR update
2015-11-11 21:13:38 +01:00
58c12a025b
Changed review step ui for better navigation
2015-11-11 18:56:31 +01:00
304d93a79a
Add charts sections
2015-11-10 14:21:39 -08:00
a57a8d8370
Merge pull request #383 from rsanchezsaez/rsanchezsaez-navigationrules
...
Add Swift tuple initializer overlay to ORKPredicateStepNavigationRule
2015-11-09 10:31:44 -08:00
2aa09084c8
PR updates
2015-11-06 22:16:43 +01:00
4d16e39f73
Merge remote-tracking branch 'apple/master'
2015-11-06 21:21:13 +01:00
d44676d816
Merge pull request #559 from umerkhan-apple/localizationBug
...
ORKCatalog Localization Files
2015-11-05 11:10:08 -08:00
18d50721cc
Merge pull request #556 from rsanchezsaez/rsanchezsaez-ORKTestNamingConventions
...
ORKTest: improve some class and method names
2015-11-05 10:52:21 -08:00
967518a576
Merge pull request #557 from umerkhan-apple/readme
...
Updating README for RK Forum.
2015-11-05 10:39:09 -08:00
ef8c1e1b3a
Merge pull request #553 from YuanZhu-apple/master_location_question_enhancement
...
Switch `ORKLocationResult`'s answer from `ORKPlacemark` to `ORKLocation`
2015-11-05 10:38:57 -08:00
6563ebdca4
Clean up NSLog
2015-11-05 10:38:34 -08:00
f85faecb49
Merge branch 'master' of github.com:ResearchKit/ResearchKit into master_location_question_enhancement
2015-11-05 10:28:08 -08:00
0341e511ab
Adding localization files for all other supported languages. No translations, only placeholder files in order to enable localization for RK Framework strings.
2015-11-04 17:07:53 -08:00
59d2ed7a39
PR updates
2015-11-04 21:54:53 +01:00
8f9ab33897
Updating README for RK Forum.
2015-11-04 10:52:47 -08:00
e5a4d01039
Merge remote-tracking branch 'apple/master'
2015-11-04 05:45:38 +01:00
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
372fbaaaa4
Merge pull request #546 from huguesbr/master
...
Fix localization when using ResearchKit as Pod (Localizable.strings > ResearchKit.strings)
2015-11-03 16:19:48 -08:00
a3c28f666c
re-add missing white space
2015-11-04 01:01:33 +01:00
4c34d1e8a3
ORKCatalog: improve naming conventions and documentation for VerificationViewController and LoginViewController subclass examples
2015-11-03 23:08:17 +00:00
50c0d4b3c0
ORKTest: improve code for Wait Task progress update
2015-11-03 22:24:35 +00:00
746b0866b0
PR changes related to displaying results
2015-11-03 22:23:27 +01:00
4b269b8c21
Updating docs to reflect new name of localized strings (ResearchKit.strings)
2015-11-03 09:30:19 +01:00
143b474aff
Rename Localizable.strings file to ResearchKit.strings and use table name in localization, avoiding conflict when including ResearchKit as a pod (the Localizable.strings files conflict with project one)
2015-11-03 09:30:19 +01:00
ca11a8def0
Merge branch 'master' of github.com:ResearchKit/ResearchKit into master_location_question_enhancement
...
Conflicts:
ResearchKit.xcodeproj/project.pbxproj
2015-11-02 17:42:22 -08:00
09cb204a24
Add copyright line.
2015-11-02 11:01:21 -08:00
20204946bc
ORKTest: change case in comments
2015-11-01 22:20:20 +00:00
74dc33a654
ORKTest: improve some class and method names
2015-11-01 22:18:17 +00:00
11a29435cd
Merge branch 'ResearchKit/master'
2015-11-01 09:01:21 +00:00
f738f18570
Update to PR to improve UI experience.
2015-10-30 12:43:31 -07:00
7af35c7c35
Replace old PAVSAT screen shoots to reflect PASAT
2015-10-29 11:00:46 -07:00
ca2f7848f8
Merge pull request #538 from umerkhan-apple/account
...
Onboarding - Account Module
2015-10-28 13:48:21 -07:00
85097a5e20
PR updates.
2015-10-28 13:20:48 -07:00
60af4ce1e5
Address PR feedback, remove location question from selection survey
2015-10-27 17:56:36 -07:00
8c10abfd74
Removing cancel button customization for Registration step.
2015-10-27 15:13:24 -07:00
0f97c0704a
Update cancel button actions for Login and Registration step.
2015-10-27 14:56:36 -07:00
a9ea108054
Incorporated edits for the new features.
2015-10-27 14:35:32 -07:00
ac0a9a25d6
Merge branch 'master' of github.com:ResearchKit/ResearchKit into master_location_question_enhancement
2015-10-27 13:07:38 -07:00
4ca0197532
Switch ORKLocationResult's answer from ORKPlacemark to ORKLocation
...
Create location questions task in ORKTest
2015-10-27 13:07:24 -07:00
e021f815ca
Merge pull request #551 from umerkhan-apple/imageCaptureBug
...
IOI # 517 - Image capture no permissions bug
2015-10-26 17:11:46 -07:00
1492ab82c1
Merge pull request #550 from umerkhan-apple/eligFix
...
IOI # 549 - Eligibility Tint Color Fix
2015-10-26 17:11:40 -07:00
61408fc5f6
Consolidated tint color change method.
2015-10-26 16:28:38 -07:00
0459818613
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules
...
# Conflicts:
# Testing/ORKTest/ORKTest.xcodeproj/project.pbxproj
# Testing/ORKTest/ORKTest/MainViewController.m
2015-10-26 22:43:35 +00:00
99bdc3cbbc
Merging upstream/master
2015-10-26 15:38:23 -07:00
c0b751d05a
Fixed error handling bug for image capture step.
2015-10-26 15:29:33 -07:00
d3ed706680
Merge branch 'stable1.2_documentation' of https://gitlab.sd.apple.com/y_zhu/GitHub-ResearchKit-Fork into stable1.2_documentation
2015-10-26 15:02:48 -07:00
d5175083ef
Incorporated edits for the rest of the classes.
2015-10-26 15:02:20 -07:00
721572a533
Minor update.
2015-10-26 12:44:42 -07:00
2494895cf9
Tint color toggle bug fix.
2015-10-26 12:23:15 -07:00
00886afe69
Displaying results for ORKLocationAnswerFormat
2015-10-26 17:53:24 +01:00
fdd608fee4
Merge remote-tracking branch 'apple/master'
2015-10-26 17:30:54 +01:00
b630dff27e
Merge branch 'ResearchKit/master'
2015-10-25 20:28:57 +00:00
c41fac8023
Displaying results
2015-10-25 18:27:34 +01:00
160b7c5f71
Merge pull request #478 from QuintilesRK/LocationQuestion
...
Location Question Type
2015-10-23 16:50:57 -07:00
1b5ea88e0f
Fixed issue causing tests to fail.
2015-10-22 15:13:48 -04:00
dd42f4740e
Accidentally removed required import on merge.
2015-10-22 12:21:05 -04:00
1f26d5c5a1
Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into LocationQuestion
...
Conflicts:
ResearchKit/Common/ORKResult.m
2015-10-22 12:16:54 -04:00
0a07f24bea
Removed unused error message.
2015-10-22 08:27:44 -04:00
224146f7fd
Handle errors that can be returned by the CLLocationManager that do not apply to the functionality of the selection view by silently absorbing the error.
2015-10-22 08:27:06 -04:00
5e7768483e
Forgot to add localizable strings.
2015-10-22 08:24:36 -04:00
2819b7714d
Merge branch 'ResearchKit/master'
2015-10-22 07:55:27 +01:00
81ec1f0056
Merge remote-tracking branch 'apple/master'
2015-10-22 00:10:02 +02:00
36f710739d
PR updates
2015-10-22 00:05:11 +02:00
66884c045b
Merge pull request #513 from rsanchezsaez/rsanchezsaez-NavigableOrderedTask
...
Use results for backwards navigation in 'ORKNavigableOrderedTask'
2015-10-21 13:47:55 -07:00
04f5a9e9f6
PR changes
2015-10-21 20:14:18 +02:00
e7ca832c3d
Updated error handling.
2015-10-21 08:59:33 -04:00
af3285f5f0
Bug fix for confirm answer format.
2015-10-20 22:17:41 -07:00
50cd9055ac
PR updates and added example to ORKTest.
2015-10-20 19:48:53 -07:00
d0226f29f7
Merge remote-tracking branch 'upstream/master' into account
2015-10-20 18:37:00 -07:00
eceeab053d
PR feedback changes.
2015-10-20 18:36:30 -07:00
aa2e83e2b5
Merge branch 'ResearchKit/master'
2015-10-20 19:09:40 +01:00
de0019054a
Merge pull request #533 from md0u80c9/ORKFormItem-optionalConvenienceInit
...
ORKFormItem optionalConvenienceInit
2015-10-20 10:47:44 -07:00
cbf9d7284f
Removed location question from form example.
2015-10-20 08:40:52 -04:00
00183879ce
Removed if statement left over from debugging.
2015-10-20 08:39:04 -04:00
58453f5df9
Pulled edge to edge presentation logic into init.
2015-10-20 08:37:50 -04:00
9c65780911
Updated confirm text answer format validation logic.
2015-10-19 18:47:23 -07:00
f7f8e12d9d
ORKResult: add indentation for collection classes description
2015-10-20 02:41:30 +01:00
ee494c5ed1
ORKResult: add 'numberOfPaddingSpacesForIndentationLevel' constant
2015-10-20 02:30:08 +01:00
12a2d556c9
ORKHelpers: simplify 'ORKPaddingWithNumberOfSpaces' function by using Foundation API
2015-10-20 02:27:44 +01:00
ce6d4fe3ac
Fix links in survey page.
2015-10-19 18:19:22 -07:00
05f2fe9db4
Minor update to DOB form item in ORKRegistrationStep.
2015-10-19 15:24:52 -07:00
7e8175b8a2
Added more error checking and updated registration step to adjust given & family name for locale.
2015-10-19 14:49:09 -07:00
c3460d8aaa
Refactored string constants for login step form items.
2015-10-19 14:09:23 -07:00
886bca74bf
PR review modifications.
2015-10-19 14:03:36 -07:00
79deaaa4b2
Merge branch 'ResearchKit/master'
2015-10-19 19:11:34 +01:00
53bb638c69
Minor fix.
2015-10-19 11:07:25 -07:00
3d40007df9
Minor documentation updates.
2015-10-19 10:57:48 -07:00
5070517ba3
Removed unnecessary lines.
2015-10-19 13:17:00 -04:00
5bca8eb66d
Updated ORKLocationQuestionResult's copy method.
2015-10-19 08:25:05 -04:00
4dff0189df
Removed unnecessary hash method override.
2015-10-19 08:24:09 -04:00
9e1e855b70
Fixed ORKLocationQuestionResult's answer format.
2015-10-19 08:21:20 -04:00
4e7f24f1c2
Reverted indentation changes to ORKESerialization.
2015-10-19 08:20:11 -04:00
3229df2a48
Updated the default location place holder string's key.
2015-10-19 08:18:41 -04:00
7bc407ee90
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules
2015-10-19 01:50:43 +01:00
96e94155d7
ORKTest: fix serialization tests
2015-10-19 01:49:15 +01:00
b8b5648c71
ORKResult: improve indentantion of collection results' 'description'
2015-10-19 01:42:30 +01:00
0471bf61d4
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-NavigableOrderedTask
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2015-10-18 20:24:10 +01:00
a0ca62ec23
Reordered the initialisers per YuanZhu's feedback.
2015-10-18 00:02:30 +01:00
a581d58243
Bug fixes
2015-10-17 16:44:59 +02:00
718a4d3ed7
PR changes
2015-10-17 12:49:24 +02:00
9241848bc3
PR changes
2015-10-17 11:09:35 +02:00
913be47d6d
Fixed corruption of project.pbxproj
2015-10-17 11:00:46 +02:00
88a94e106b
PR Changes
2015-10-17 10:47:17 +02:00
2469bfe5a3
Merge remote-tracking branch 'apple/master'
2015-10-17 10:45:19 +02:00
6ec5df751d
PR changes
2015-10-17 10:40:14 +02:00
aac14a3a1a
Minor formatting fixes.
2015-10-16 18:38:53 -07:00
696758bdc2
Added more validation checks.
2015-10-16 18:26:05 -07:00
43b6585bfa
Minor updates.
2015-10-16 16:38:34 -07:00
f47f9d824c
Updates
2015-10-16 16:23:13 -07:00
7ef55e55e7
Bug fux
2015-10-16 21:51:00 +02:00
9b4152ec6e
Aligned text field and map with the rest of the form question cells.
2015-10-16 15:23:39 -04:00
b58ae6139b
Adjusted map size to ensure that the text field was visible on all devices.
...
Removed the code to scroll the text field into view as the scroll offset change was being overriden by the animation of the keyboard changing the table view offset.
2015-10-16 15:12:57 -04:00
7ba97f4089
Removed unnecessary cast.
2015-10-16 14:33:55 -04:00
a2bfb9a15d
Switched to using predefined vertical margin.
2015-10-16 14:33:06 -04:00
17b7d7d4f9
Merge remote-tracking branch 'upstream/master' into account
2015-10-16 10:47:20 -07:00
d9e2f54c41
Changes made per UmerKhan-apple's suggestions
2015-10-16 08:19:34 +01:00
9347ef6573
Updated serialization.
2015-10-15 18:03:49 -07:00
ed4a50dacc
Few API edits.
2015-10-15 11:47:16 -07:00
d8d3882a1c
Update ORKScaleAnswerFormat Class Reference
2015-10-15 11:43:47 -07:00
ec8308b8bd
Code snippet for ORKNavigableOrderedTask, and Email answer format.
2015-10-15 11:28:43 -07:00
9296fe90bc
Moved map view initialization
2015-10-15 09:16:36 -04:00
df9170f9cf
Removed extra method.
2015-10-15 09:06:58 -04:00
0deb8ba55e
Switched the focus of the form cell from the map view to the text field.
2015-10-15 09:05:49 -04:00
b24310adbc
Removed unnecessary variable.
2015-10-15 08:57:13 -04:00
c138f6aa02
Marked constant span values as constants.
2015-10-15 08:56:28 -04:00
49e541d1b7
Set the map region's coordinate directly.
2015-10-15 08:55:28 -04:00
f22676a8e7
Switched isEqual to ORKEqualObjects
2015-10-15 08:54:17 -04:00
d34749e1ef
Copy answer before setting the answer property
2015-10-15 08:52:34 -04:00
0e4251d511
Directly use string from ABCreateStringWithAddressDictionary
2015-10-15 08:50:07 -04:00
06ff988941
Removed unnecessary casts.
2015-10-15 08:49:26 -04:00
3b3c907d39
Removed extra class from ORKResult.h
2015-10-15 08:47:27 -04:00
b1515e0fc2
Removed unnecessary method.
2015-10-15 08:46:43 -04:00
f9924ddbc0
Removed debug log from tests.
2015-10-15 08:44:24 -04:00
bbde9865ee
suggestedCellHeightForView now returns a height based off of the screen metric.
2015-10-15 08:35:39 -04:00
cfa9e90d76
Corrected ORKOrderedTask description.
2015-10-15 00:13:12 -07:00
851bd4e2c5
Added ORKFormStep optional convenience initialiser.
...
Updated the optional form test to confirm all is working.
2015-10-15 04:13:05 +01:00
9fbabf8f3b
Merge pull request #528 from rsanchezsaez/rsanchezsaez-ChartsPerformanceTest
...
ORKTest: add 'Test Charts Performance' item
2015-10-14 18:04:34 -07:00
536a22f733
Merge pull request #526 from YuanZhu-apple/master_should_able_to_contine_with_default_value_on_scale
...
Refractor scale answer format
2015-10-14 17:42:31 -07:00
e51c9b708a
Should set currentNumberValue to nil if passed in currentTextChoiceValue is not match any of the text choices.
2015-10-14 17:41:10 -07:00
b45425ba72
Update API doc
2015-10-14 17:38:06 -07:00
181651b365
Update string.
2015-10-14 17:35:00 -07:00
b8d2c6bf86
Address review feedback
2015-10-14 17:33:42 -07:00
feb5f11e3e
CharDataSources.swift: add PerformanceLineGraphChartDataSource
2015-10-15 00:54:10 +01:00
8d4b73ae8f
Style adjustment
2015-10-14 16:31:57 -07:00
81e67dc6fa
Use _textChoices instead of self.textChoices
2015-10-14 16:30:24 -07:00
e873af81d6
Style adjustment.
2015-10-14 16:24:19 -07:00
59681fbab5
Other review feedback update.
2015-10-14 16:11:41 -07:00
a3a53b7c68
Make separate ORKTextScaleAnswerFormatProvider to carry the methods for ORKTextScaleAnswerFormat
2015-10-14 15:59:28 -07:00
a28e2596bd
Change protocol method from defaultNumber to defaultAnswer to better work with ScaleSliderView.
2015-10-14 15:50:04 -07:00
f5e8b40f6d
Style update
2015-10-14 15:36:10 -07:00
55bc242896
Removed disabled confirm textfield feature.
2015-10-14 14:51:18 -07:00
d3dee01678
Refactored to view controller parameter rather than Class parameter.
2015-10-14 14:47:15 -07:00
a6445546fd
Updated confirm text answer format.
2015-10-14 14:30:38 -07:00
44a786d51d
Switch returned error message to localizedFailureReason.
2015-10-14 15:19:21 -04:00
5954a6b254
Moved size of map to screen metric.
2015-10-14 15:15:04 -04:00
06eecb054c
Updated serialization and unit tests of ORKPlacemark.
...
- Added ORKPlacemark to public header.
- Added NSSecureCoding, NSCopying, isEqual: to ORKPlacemark
- Finished replacing MKPlacemark to ORKPlacemark
- Updated ORKTestTests
2015-10-14 14:53:50 -04:00
c38da58f6b
Added open source license.
2015-10-14 08:45:32 -04:00
17c35e6765
Updated horizontal margins.
2015-10-14 08:44:34 -04:00
1074eefbbe
Added confirm text answer format and cell.
2015-10-13 20:16:47 -07:00
6c54eea404
API reference edits incorporated (part 1)
2015-10-13 15:05:56 -07:00
daa267b8f0
ORKTest: add 'Test Charts Performance' item
2015-10-13 22:43:30 +01:00
7f66623c59
Merge branch 'ResearchKit/master'
2015-10-13 22:18:32 +01:00
7854c619a3
Added LoginStep and refactored minor things.
2015-10-13 14:10:21 -07:00
deef811bc9
Moved where the initial coordinate region is set.
2015-10-13 10:38:05 -04:00
b9fff0e4c0
Removed extra text color change.
2015-10-13 10:23:05 -04:00
f35e84189c
Removed extra answerDidChange call.
...
Fixed extra annotations bug.
2015-10-13 09:57:42 -04:00
5ff0f9324a
Updated error message.
2015-10-13 09:48:44 -04:00
35d33709b2
Added support for ORKNullAnswerValue to the selection view.
2015-10-13 09:46:28 -04:00
0d9c98dd56
Fixed the selection view's first responder being ignored.
2015-10-13 08:14:39 -04:00
2ac5e30d85
Refractor scale answer format.
...
1. fix for #511 "Continue button is disabled on scale with default values"
2. refactor ORKScaleSliderView to work better with three scale related answer format.
2015-10-12 16:23:22 -07:00
d1e246bba4
Adding wait step to account creation task.
2015-10-12 14:46:00 -07:00
0dc31e4593
Merge pull request #512 from md0u80c9/restorationData
...
RestorationData
2015-10-12 12:01:57 -07:00
521dba3d4e
Removed invalid location answer error creation as it is not possible for the user to create an invalid coordinate.
2015-10-12 10:40:52 -04:00
07e05298a0
Removed the MKPlacemark string conversion and replaced with a subclass of MKPlacemark.
2015-10-12 10:33:05 -04:00
9214c48d41
Added ORKPlacemark class.
2015-10-12 10:06:38 -04:00
ebdc7a218a
Added MKPlacemark serialization tests.
2015-10-12 09:47:03 -04:00
3d9cc15c0b
Fixed issue where previously entered answer would be overridden with current location after coming back to the question.
2015-10-12 08:42:50 -04:00
41d6a415ad
Bug fixes
2015-10-12 11:59:10 +02:00
f45722366c
ORKNavigableOrderedTask: add loop support information to headerdocs
2015-10-11 13:16:58 +01:00
10152cfb79
ORKNavigableOrderedTask: reverse backwards navigation iteration
...
This fixes the behavior correct when you have visited the same step more than once (otherwise you'd get the previous step on your first visit).
Also, stop iteration as soon as possible, and improve loop warning
2015-10-11 12:50:47 +01:00
038794df0d
ORKTaskViewController: make _managedStepIdentifiers array again
...
This is the original behavior, it follows the pop/push model. All the backward navigation stack is preserved, but older results which are ovewritten if you revisit the same step on a loop. Thus, going over a loop will produce duplicate results for the steps that are seen more than once (all the duplicate step results will point to the same result instance: the one corresponding to the last time you visited the step).
2015-10-11 12:46:53 +01:00
d74bfe956f
ORKResult: improve results' description
...
Also, use description to print task results in 'ORKTest'.
2015-10-11 12:42:47 +01:00
a3b2d68b7a
State restoration bugfix #2
2015-10-11 12:43:52 +02:00
87560025c8
State restoration bugfix
2015-10-11 12:34:08 +02:00
af9588fd93
Revert to property notation.
2015-10-10 16:13:47 -04:00
80ee2b8792
Mark three ORKLocationSelectionViewDelegate event callbacks as optional.
2015-10-10 16:12:10 -04:00
8dffe81ea7
Replace ORKNullAnswerValue test with more complete ORKIsAnswerEmpty.
2015-10-10 15:48:29 -04:00
95099e34de
Initialize the subview earlier, and access the placeholder directly from the form.
2015-10-10 15:42:47 -04:00
9dc22ff97e
Remove unimplemented applyAnswerFormat from ORKFormItemLocationCell.
2015-10-10 15:15:27 -04:00
df7a5d2ae4
Remove blank line in import statements.
2015-10-10 15:11:14 -04:00
475d84de73
Implement copyWithZone for ORKLocationAnswerFormat
2015-10-10 15:10:30 -04:00
cc6380af67
Utilize constants for JSON keys.
2015-10-10 14:29:42 -04:00
ebf3a5474d
Unit tests: test new navigable ordered task navigation model
2015-10-10 17:04:21 +01:00
f8a94a0f66
ORKTest: update unit tests
2015-10-10 16:47:48 +01:00
1afb67bf9e
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-NavigableOrderedTask
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2015-10-10 16:17:02 +01:00
258afcb7df
ORKTest: direclty call TaskFactory method
2015-10-10 16:07:05 +01:00
8a3882d85c
Fix ResearchKit unit tests not running due to Swift code
2015-10-10 16:06:46 +01:00
2bd667bc6f
ORKTest: rename Swift 'TestHelpers' to 'TaskFactory'
2015-10-10 15:39:11 +01:00
7a4715dd72
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2015-10-10 15:37:12 +01:00
8f7047220f
Merging master and resolving merge conflicts.
2015-10-09 14:58:04 -07:00
fda01e8dd0
Merge pull request #518 from YuanZhu-apple/master_fix_First_Last_Name_logic_in_consent
...
Fix Issue #516 : Consent required name logic is invalid
2015-10-09 14:56:10 -07:00
8042df3127
Documentation tweak.
2015-10-09 17:40:50 -04:00
153726633f
Rename conversion methods to be more explicit about JSON strings.
2015-10-09 17:40:10 -04:00
4040d962a0
Added rules for scale answer format.
2015-10-09 12:07:26 -07:00
861211fa3b
Integrate MKPlacemark JSON serialization.
2015-10-09 10:28:03 -04:00
a8f6be61f3
Copyright updates
2015-10-09 08:38:43 -04:00
7c01903108
Replace spaces with tabs, to follow convention.
2015-10-09 08:05:25 -04:00
848800bcd6
Reintroduce Wait Step, resolution of merge conflict.
2015-10-09 07:58:51 -04:00
caa324ec79
Merge branch 'master' into LocationQuestion
2015-10-09 07:56:21 -04:00
27bf948f6d
Merge remote-tracking branch 'ResearchKit/master'
2015-10-09 07:45:26 -04:00
ed60c84a2d
Added vertical slider answer format.
2015-10-08 20:01:49 -07:00
e70d56142d
Incorporated active task's feedback.
...
Added ORKNavigableOrderedTask.
2015-10-08 19:40:49 -07:00
a4c9286f29
Merge pull request #520 from umerkhan-apple/waitTask
...
Rearranging ORKTest and ORKCatalog for WaitTask.
2015-10-08 18:26:59 -07:00
97c5ada28f
Rearranging ORKTest and ORKCatalog for WaitTask to comply with alphabetic ordering.
2015-10-08 18:21:11 -07:00
fd0d4af750
Merge pull request #477 from QuintilesRK/WaitTask
...
Wait Task
2015-10-08 18:11:18 -07:00
dc81d8af3a
Remove identifier serialization from ORKPasscodeStep as well.
2015-10-08 21:05:05 -04:00
deac6b5de0
Remove incorrect serialization of identifier for ORKWaitStep (defined in base class).
2015-10-08 21:04:25 -04:00
2c504f4b01
Merge remote-tracking branch 'ResearchKit/master'
2015-10-08 20:58:39 -04:00
db4b19b229
Add ORKQuestionTypeLocation to section types.
2015-10-08 20:51:57 -04:00
129d2ac3df
Add Apple to copyright headers
2015-10-08 20:37:46 -04:00
0790e52a5a
Replace remaining reference to indicatorType with indicatorMask, resolving unit test issue.
2015-10-08 20:31:09 -04:00
9784c1425a
Merge pull request #476 from QuintilesRK/ValidatedText
...
Validated Text
2015-10-08 17:26:20 -07:00
df13dca4d9
Update two copyright headers.
2015-10-08 20:20:39 -04:00
acfce230b4
Re-implement the cached percent formatter.
2015-10-08 20:19:10 -04:00
bfac86d706
Merge pull request #1 from umerkhan-apple/waitStep
...
Wait Step
2015-10-08 20:14:08 -04:00
c2e2951d6f
Cache the regular expression.
2015-10-08 19:52:39 -04:00
36a578549b
Refactor common initialization code out into a commonInit method.
2015-10-08 19:34:35 -04:00
165e107ddc
Fix Issue #516 : Consent required name logic is invalid
...
#516
Should update this code after we adding in #443 .
2015-10-08 15:43:44 -07:00
e32efc4ec2
Merge pull request #515 from YuanZhu-apple/master_fix_unit_test
...
Clear unexpected exceptions from unit tests.
2015-10-08 14:40:53 -07:00
3479c35fb3
Code refactor
2015-10-08 13:32:07 -07:00
74fbc9af77
Merge branch 'waitStep' of https://github.com/umerkhan-apple/ResearchKit into waitStep
2015-10-08 12:57:00 -07:00
ec91b7b139
Clear unexpected exceptions from unit tests.
...
- `HTMLForSignature:` would throw exception on a nil `signature.title`
2015-10-08 12:56:46 -07:00
d4403704ce
Re-ordering wait task in ORKTest to stay consistent with alphabetic ordering.
2015-10-08 12:52:57 -07:00
4919e0fc0c
Refactoring WaitStep logic and formatting.
2015-10-08 12:48:33 -07:00
dc3c6e011c
PR changes
2015-10-08 20:47:55 +02:00
4c49283504
removed duplicate self.delegate allocation
2015-10-08 19:31:48 +01:00
26a094e05f
Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into WaitTask
...
Conflicts:
samples/ORKCatalog/ORKCatalog/Tasks/TaskListRow.swift
2015-10-08 14:23:27 -04:00
d6504c68ef
Undo deletion of MKPlacemark category.
2015-10-08 14:15:08 -04:00
f90af1ce01
Added MapKit Framework to ORKTest project.
2015-10-08 14:10:21 -04:00
ae6fcf4ce4
Re-insert ValidatedTextQuestion cases that were incorrectly merged out in 52d5fca
2015-10-08 14:07:33 -04:00
8730a26be1
Updated initializer for ORKLocationSelectionView.
2015-10-08 11:57:00 -04:00
20d6defb6f
Added property to enable/disable automatically retrieving the user's current location.
2015-10-08 11:37:26 -04:00
cf917dc208
Added serialization tests for location step and result.
2015-10-08 11:12:13 -04:00
47ad36d906
Added the location permission request string to ORKTest to enable automatic location retrieval.
2015-10-08 09:40:51 -04:00
e69228445a
Updated ORKCatalog's info.plist with the new location permission request string.
2015-10-08 09:35:52 -04:00
90619ac2af
Removed unnecessary method that caused the wrong value to be set to the ORKLocationQuestionResult's locationAnswer property.
2015-10-08 09:34:00 -04:00
43c4b892b2
Added new lines before and after imports.
2015-10-08 09:05:11 -04:00
1c2028ce5d
Updated legal headers in MKPlacemark category.
2015-10-08 09:03:06 -04:00
29942a01d5
Added address field placeholder to localized strings.
2015-10-08 09:02:01 -04:00
c159d6db61
Updated cell expansion animation.
2015-10-08 09:00:51 -04:00
7635528b2f
Removed extra line from localized strings.
2015-10-08 08:56:39 -04:00
d5b6b0f87a
Refactored ORKSurveyAnswerCellDelegate method name to be in line with the ORKFormItemCell.
2015-10-08 08:55:54 -04:00
328b8421a3
Switched constants from #define to static const CGFloat
2015-10-08 08:52:35 -04:00
b4a2cbebd0
Removed prefixes from location selection view constants.
2015-10-08 08:51:27 -04:00
9a749c5489
Added non null assumptions.
2015-10-08 08:49:06 -04:00
09272a78df
Removed second unused method.
2015-10-08 08:47:06 -04:00
92ae7cf071
Removed unused method.
2015-10-08 08:46:36 -04:00
b5568e278b
Renamed ORKFormItemLocationCell's constraint set up method.
2015-10-08 08:46:03 -04:00
33864f1012
Updated error strings for invalid coordinates.
2015-10-08 08:44:28 -04:00
2534e6b20e
Fixed syntax error.
2015-10-08 08:21:44 -04:00
56b50e9296
Removed a wandering ')' seemed to have slipped the net.
2015-10-08 11:09:44 +01:00
8eb756b96c
Merge conflicts
2015-10-07 22:07:17 -04:00
52d5fcabe7
Merge branch 'master' into ValidatedText
2015-10-07 22:05:11 -04:00
bf07984430
Merge remote-tracking branch 'ResearchKit/master'
2015-10-07 21:56:53 -04:00
0554cbd6f1
Implement serialization, copying, and equality logic for regex and invalidMessage. Resolves unit test failures.
2015-10-07 21:55:47 -04:00
b34d1ecd29
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules
2015-10-07 23:23:08 +01:00
f3c7c53e21
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-NavigableOrderedTask
2015-10-07 23:14:38 +01:00
59045b27a5
Revert changes from bad merge at c113deb
2015-10-07 14:59:59 -07:00
14ea5cc282
Updated changes to ORKLoginStep.
2015-10-07 14:05:14 -07:00
ec04a5c633
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-NavigableOrderedTask
2015-10-07 22:03:27 +01:00
f1e4941f3f
ORKNavigableOrderedStack: use task results for backwards navigation
...
This commits removes ORKNavigableOrderedTask's '_stepIdentifierStack' ivar (used for backwards navigation) and uses the managed task results instead. The managed task result will only show results for the steps that have been previously visited, so it can be used to simulate the backwards navigation stack.
The ORKTaskViewController's '_managedStepIdentifiers' ivar has been converted into an 'NSMutableOrderedSet'. When an already visited step is shown (either by going back, or by following a loop in a navigable ordered task), all the managed step identifiers which come later than the step being shown are removed.
This commit also updates the 'ORKTest' to remove the "Save For Later" task archiving (which is no longer needed) and updates the 'Ordered Loop Task' example to be more comprehensive by featuring a branched question.
2015-10-07 22:03:03 +01:00
bb01f0bb4d
Utilize string formatting for error messages. Update comments. Change location of ORKTest URL test to in-line beneath e-mail.
2015-10-07 16:53:50 -04:00
7ebc03c93f
Ensure we set up the delegate.
2015-10-07 21:43:38 +01:00
413bc6682a
Amended ORKTaskViewController initWithTask to take a nullable restorationData field.
...
Updated ORKTest to allow us to test this out.
tested with NavigableOrderedTask.
2015-10-07 21:22:26 +01:00
9ccf4fb743
Merge branch 'ResearchKit/master'
2015-10-07 21:12:31 +01:00
723075a61f
Merge branch 'ResearchKit/master' into restorationData
2015-10-07 21:11:53 +01:00
c659539a45
ORKResult: homogenize results 'description' strings
...
Also: add result description for 'ORKCollectionResult' and 'ORKQuestionResult'.
2015-10-07 20:29:46 +01:00
48661fe670
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2015-10-07 19:54:33 +01:00
b9fadc1b87
ORKTest: add 'Navigable Loop Task'
...
The 'Navigable Loop Task' allows testing of optional 'ORKNavigableOrderedTask' looping (when you loop, all the navigation history after the targeted step is discareded).
Also:
- Improve style and conform to naming conventions in MainViewController.m.
2015-10-07 19:17:08 +01:00
11dc10e66e
Merge pull request #509 from YuanZhu-apple/master_fix_save_for_later
...
If a task in ORKTest has been cancelled and saved, the output directory should be kept.
2015-10-07 10:32:42 -07:00
6911fe614f
Update for feedback.
2015-10-07 10:26:10 -07:00
452665de14
Merge ResearchKit/master into ResearchKit/LocationQuestion
2015-10-07 10:43:32 -04:00
1f352c39d2
Updated ORKWaitStep serialization.
2015-10-07 09:23:34 -04:00
e42c92004a
Fixed syntax error.
2015-10-07 09:18:57 -04:00
17ac3f5177
Updated changed method name in ORKTest.
2015-10-07 09:09:53 -04:00
400da43f42
Cached the percent formatter.
2015-10-07 09:07:23 -04:00
c0aed6d641
Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into WaitTask
...
Conflicts:
samples/ORKCatalog/ORKCatalog/Tasks/TaskListRow.swift
2015-10-07 09:05:22 -04:00
f7e9c672e2
Added serialization tests for the wait step.
2015-10-07 08:26:48 -04:00
7f106898e2
Merge pull request #462 from rsanchezsaez/rsanchezsaez-changelog
...
Add CHANGELOG.md
2015-10-06 15:58:12 -07:00
d3da59a4f6
In ORKTest, if a task has been cancelled and saved, the output directory should be kept.
...
ORKURLFromBookmarkData() fails to return a valid URL, when the resolving directory is not exist.
2015-10-06 14:33:47 -07:00
8a78e95ebb
Added Login step and updated documentation.
2015-10-06 13:55:28 -07:00
c113deb1a3
Merge branch 'master' of https://github.com/ResearchKit/ResearchKit
2015-10-06 13:36:09 -07:00
3097232bd5
Converted weakSelf to strongSelf in block.
2015-10-06 15:13:14 -04:00
04a55343bc
Cleaned up imports.
2015-10-06 15:07:06 -04:00
485e6035e0
Updated percent string to use NSNumberFormatter
2015-10-06 14:59:29 -04:00
785ea40fc4
Constraint handling updated.
...
Static constraints now set up in setUpConstraints
Changing constraints now set up in updateConstraints if needed.
2015-10-06 14:55:07 -04:00
69319a3c5e
RELEASE-NOTES.md: fix typo
2015-10-06 20:47:39 +02:00
c10ab44036
Consolidated indicator mask view creation.
2015-10-06 14:47:01 -04:00
3fdbad88b2
Updated framework headers.
2015-10-06 14:27:35 -04:00
2287b99b86
Moved wait task creation code in ORKTest
2015-10-06 14:23:02 -04:00
3d6a7fa481
Updated accessibility to read out the progress value.
2015-10-06 14:16:03 -04:00
0759764889
Added hard line wraps.
2015-10-06 14:07:05 -04:00
e3ab9d75ef
Removed unnecessary tint color management
2015-10-06 14:03:12 -04:00
f401dcf94d
Moved the wait step classes into the common folder.
2015-10-06 13:57:01 -04:00
b941379779
Refactored the wait step into a normal step.
2015-10-06 13:54:16 -04:00
f2d13d1305
Reordered Validated Text Question between Value Picker and Image Capture per @rsanchezsaez feedback.
2015-10-06 11:59:33 -04:00
96e5f26f7d
Updated the result to return a placemark
2015-10-06 11:17:36 -04:00
cecef562a9
Update localizedInvalidValueStringWithAnswerString to check both string length and regex validity when building a string.
2015-10-06 10:44:27 -04:00
7d2d04239f
Remove emailAddress from ORKTextAnswerFormat.
2015-10-06 10:28:44 -04:00
2b649f9e12
Split out method for isTextRegexValidWithString. Update initializers to match recent argument changes.
2015-10-06 10:22:30 -04:00
a9478c3cb0
Remove assignment to local variables per review feedback.
2015-10-06 09:23:11 -04:00
9b64b9c0f0
Change the argument name for textAnswerFormatWithValidationExpression. Reorder properties to be grouped together. Correct outdated documentation.
2015-10-06 09:18:51 -04:00
ac0f3c542c
RELEASE-NOTES.md: take care of internal review feedback
...
Also:
- Encode '(' and ')' symbols in URL (they interferred with markdown syntax).
- Use Title Capitalization for all section titles.
- Mention "General stability and performance improvements" on each release introducion instead of as a separate section.
2015-10-06 14:36:53 +02:00
2e356cac03
Added confirm passcode field.
2015-10-05 16:55:51 -07:00
91d4fa7890
Merge pull request #498 from ResearchKit/localizationFix
...
IOI # 495 - Localization fallback language
2015-10-05 13:37:42 -07:00
18504e9ffe
Merge pull request #493 from umerkhan-apple/touchID
...
Passcode updates
2015-10-05 13:21:46 -07:00
d80ca89094
PR update.
2015-10-05 13:11:32 -07:00
706900ff07
Updated ORKVerificationStepView controls and constraints.
2015-10-05 13:03:17 -07:00
20cfa9f588
Fixed layout constraint errors
...
Note: The height of the cell separator needs to be accounted for, it is
subtracted from the cell height returned/calculated by the UITableView.
2015-10-05 14:49:08 -04:00
76aef1a069
Naming tweak from setupConstraints to setUpConstraints for consistency.
2015-10-05 14:18:11 -04:00
4afe6dcf77
Merge from master
2015-10-05 14:11:07 -04:00
4d82dcb8f3
Merge branch 'master' into WaitTask
2015-10-05 14:09:58 -04:00
d2c381fefb
Merge remote-tracking branch 'ResearchKit/master'
2015-10-05 13:51:34 -04:00
fbfeb233fa
Clearing the text field now resets the map view to its initial state
2015-10-05 09:51:14 -04:00
2a4b1b370a
Automatically obtain user's location upon presenting the map view
2015-10-05 09:37:28 -04:00
52ef002a67
Address now updated immediately after search
2015-10-05 09:34:05 -04:00
65e2946cba
Keyboard dismissed on search
2015-10-05 09:33:28 -04:00
52fbba25b8
Fixed layout issues for the ORKQuestionStep
2015-10-05 09:27:21 -04:00
73c59a40b9
Added location question result to the result table view.
2015-10-05 08:09:49 -04:00
87c6feceaa
Removed current location button
2015-10-05 08:09:15 -04:00
0180500607
Merge remote-tracking branch 'apple/master'
2015-10-03 12:02:33 +02:00
42e6c97ee2
API changes
2015-10-03 12:02:18 +02:00
4bfc412626
Sorted the location question alphabetically in the catalog
2015-10-02 22:49:27 -04:00
8621b38a89
Added array contents to constraints array
2015-10-02 22:33:29 -04:00
8517354463
Fixed missing metric values.
2015-10-02 22:29:12 -04:00
250d016306
Switch true/false to YES/NO
2015-10-02 22:28:13 -04:00
a2a73b1661
Merge latest ResearchKit/master
2015-10-02 16:57:35 -04:00
46e61011a2
Active tasks revised.
2015-10-02 13:26:34 -07:00
13ab769dd8
Add suportsSecureCoding to ORKWaitStep, addressing unit test issue.
2015-10-02 16:10:40 -04:00
30f3900307
Copyright statement updates
2015-10-02 15:52:42 -04:00
f85a4c0c06
Moved coordinate translator into a helper method.
2015-10-02 15:51:15 -04:00
32fc46f896
Remove ORKProgressIndicatorMaskNone option, and add additional documentation.
2015-10-02 15:50:34 -04:00
f15940f83e
Modified task view controller and ORKStep to allow for custom class variable.
2015-10-02 11:38:03 -07:00
310080fc8e
Switched ORKEmailAnswerFormat to utilize ORKTextAnswerFormat with EmailValidationRegex. Removed isEmailAddressValidWithString. Disabled spell checking and auto correction.
2015-10-02 14:31:33 -04:00
b41e0be80f
More refactoring, weakSelf / strongSelf and others...
2015-10-02 09:26:49 +02:00
c7d1d99b32
Switched from UIActivityIndicator to ORKProgressView
2015-10-02 08:55:07 +02:00
684dd82c15
Added constraints.
2015-10-01 20:56:00 -07:00
c0ff5bc6e0
Minor update.
2015-10-01 18:14:20 -07:00
d2381657fa
Adding ORKVerificationStepView foundation.
2015-10-01 18:09:27 -07:00
3463f1a16f
Added ORKVerificationStepViewController foundation.
2015-10-01 17:26:31 -07:00
9878b34c2a
Added Verification Step.
2015-10-01 17:08:30 -07:00
81bc7221d1
Nit fix.
2015-10-01 16:45:40 -07:00
a5bb7b5506
PR updates.
2015-10-01 16:38:37 -07:00
921b280a3b
Added all the new task in Active task module.
2015-10-01 16:04:51 -07:00
d313ab3a45
Merge pull request #497 from oliverschaefer/issue471
...
IOI 471
2015-10-01 15:32:59 -07:00
73657854d4
Adding localization fallback to be U.S. English.
2015-10-01 15:18:05 -07:00
7dc91f531d
Quick fix.
2015-10-01 14:44:04 -07:00
294ec34d47
IOI 471
2015-10-01 23:38:01 +02:00
ce6c79a60f
Minor changes
2015-10-01 23:01:54 +02:00
86bcdaa3ee
Minor changes
2015-10-01 22:57:32 +02:00
bcfb0b4dbb
Minor keyboard fix.
2015-10-01 13:45:12 -07:00
82c325d6c7
Updating serialization files.
2015-10-01 10:42:26 -07:00
6d2c1400b1
Merge remote-tracking branch 'apple/master'
2015-10-01 17:02:45 +02:00
8fa8dbae9e
Changed progress label appearance when reviewing a step
2015-10-01 16:50:10 +02:00
c7bd1f5c41
Merge pull request #490 from YuanZhu-apple/master_fix_section_title_misalignment
...
Fixed the section header misalignment in form page.
2015-09-30 22:42:39 -07:00
bdb6849ab5
Merge pull request #483 from YuanZhu-apple/master_improve_json_unit_test
...
Make the test for ORKESerialization to catch unregistered classes.
2015-09-30 22:41:45 -07:00
6d1d22d9fa
Fixed the section header misalignment in form page.
...
1. Created `ORKFormSectionHeaderView` to update it constraint when screen rotates.
2. Use `dequeueReusableHeaderFooterViewWithIdentifier:` to cache created header views.
3. Other code refactoring.
2015-09-30 17:56:52 -07:00
393a2bf404
Updates to Registration Step.
2015-09-30 17:18:48 -07:00
f828fbd8c4
Merge pull request #488 from rsanchezsaez/rsanchezsaez-ORKTest
...
ORKTest: add 'Passcode' section and sort items alphabetically
2015-09-30 16:15:22 -07:00
27193727e9
ORKTest: add 'Passcode' section and sort items alphabetically
2015-10-01 00:10:10 +01:00
a7173cc746
Merge branch 'master' of github.com:ResearchKit/ResearchKit into master_improve_json_unit_test
...
Conflicts:
Testing/ORKTest/ORKTest/ORKESerialization.m
2015-09-30 15:15:42 -07:00
b0977b55e0
Merge pull request #487 from umerkhan-apple/touchID
...
Passcode Module Update
2015-09-30 15:06:40 -07:00
6d792cfd83
Merge pull request #486 from YuanZhu-apple/master_fix_audio_UI
...
Fix audio task layout problem
2015-09-30 14:57:54 -07:00
fb6b1ab2c5
PR updates.
2015-09-30 14:48:38 -07:00
ab729432b4
Merge pull request #456 from umerkhan-apple/screening
...
Screening Module ⎯ Eligibility Answer Format
2015-09-30 14:29:18 -07:00
5b5e53bdc3
Minor update.
2015-09-30 14:28:25 -07:00
2b6c69e01d
Resolving merge conflicts.
2015-09-30 14:26:08 -07:00
fb1c5e9b9a
Resolving merge conflicts
2015-09-30 14:11:59 -07:00
f4b4d2aee1
Minor fixes.
2015-09-30 14:08:06 -07:00
96478c583d
Error handling updates to Passcode.
2015-09-30 14:04:26 -07:00
a796e6cc1e
Merge pull request #373 from shazino/9hpt-task
...
Hole Peg Test task
2015-09-30 14:03:51 -07:00
8599553a79
Updates to passcode
2015-09-30 11:41:10 -07:00
8197c147e1
Fix audio task layout problem.
2015-09-30 11:19:54 -07:00
8bdb32fc7a
Updates
2015-09-30 10:42:43 -07:00
16f9b1dbe1
Merge remote-tracking branch 'origin/9hpt-task' into 9hpt-task
2015-09-30 17:00:14 +02:00
9459e330d5
Merge branch 'master' of ResearchKit/ResearchKit
2015-09-30 16:42:27 +02:00
78be958aea
Fix ORKTest issue.
2015-09-30 16:22:23 +02:00
3c9291ed24
Refactored code as requested
2015-09-30 09:24:38 +02:00
5454cf83e1
Merge branch 'master' of github.com:ResearchKit/ResearchKit into master_improve_json_unit_test
...
Conflicts:
ResearchKit.xcodeproj/project.pbxproj
2015-09-29 23:48:54 -07:00
b4e8a91474
Merge pull request #444 from umerkhan-apple/touchID
...
IOI # 88 - Passcode w/TouchID
2015-09-29 23:45:15 -07:00
829f93523a
Refactored code as requested
2015-09-30 08:22:59 +02:00
98b0acaeb7
Disabling init for ORKPasscodeViewController.
2015-09-29 20:39:43 -07:00
91a9acb9ef
Modifying question text for eligibility task to the generic example question.
2015-09-29 20:31:50 -07:00
71bdaab7be
Updates to registration step.
2015-09-29 20:27:17 -07:00
3e18a08690
Added registration step.
2015-09-29 18:07:18 -07:00
63b8bea246
Enhance the test for ORKESerialization to catch unregistered classes.
...
Also add the missing class registrations.
2015-09-29 18:01:23 -07:00
7a1a1c6cdd
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-changelog
2015-09-30 01:25:19 +01:00
2b7f05fd96
RELEASE-NOTES.md: minor improvements
2015-09-30 01:25:08 +01:00
d26712e5a1
README.md: add 'Charts' section
...
Also add information about the chart examples in ORKCatalog.
2015-09-30 01:23:22 +01:00
0eba3970b5
README.md and Programming Guide: fix minor formatting issues
2015-09-30 01:20:42 +01:00
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
234f40306a
Merging master
2015-09-29 14:00:49 -07:00
66218e4e28
Added serialization.
2015-09-29 13:56:38 -07:00
130898cafd
Added serialization.
2015-09-29 13:47:10 -07:00
7db4bf50c8
Merge pull request #481 from matteocrippa/pdfsignaturenullable
...
signature.title exception on null
2015-09-29 13:01:45 -07:00
feb26fa506
Refactored code as requested
2015-09-29 18:15:53 +02:00
c317b30e82
Minor documentation update.
2015-09-28 14:41:46 -07:00
af6b027b7c
Added Passcode Task into ORKCatalog and minor fixes.
2015-09-28 14:25:21 -07:00
3c715cc211
fixed Signature capitalized
2015-09-28 23:09:32 +02:00
c7bddcf4d5
signature.title exception on null
2015-09-27 15:02:06 +02:00
ad9eefb19a
Remove spoken instruction.
2015-09-25 21:01:48 +02:00
537e67af78
Fix ORKTest issue.
2015-09-25 11:11:14 +02:00
1c16398bc7
Change ORKSide to ORKBodySagittal
2015-09-25 10:09:14 +02:00
ca292c1987
Nits
2015-09-24 18:26:15 -07:00
7a9009759e
Minor fix.
2015-09-24 18:22:09 -07:00
2040bbd095
Updated documentation in answer format and adde eligibility task example in ORKCatalog.
2015-09-24 18:18:53 -07:00
111ac5627a
Minor refactoring fix.
2015-09-24 15:45:29 -07:00
57f911a4bb
Refactoring ORKEligibilityAnswerFormat after PR discussion.
2015-09-24 15:42:50 -07:00
17776d04a4
Merge branch 'master' into LocationQuestion
...
* master: (114 commits)
ResearchKit Project: add explicit 'ORK_LOG_LEVEL_WARNING=1'
ORKImageSelectionView: resolve merge conflict
ORKTest: fix column width not being updated after rotation
ORKImageCaptureStepViewController: restore 'queue_' method prefix
ORKTappingContentView: slight constraint refactor
ORKSkin: hide 'ORKGetMetricForScreenType()' function; use 'ORKGetMetricForWindow()' instead
Misc: remove extra newlines before 'else'
Misc: remove additional space after '!' unary operator
Misc: homegenize whitespace between consecutive closing and opening brackets
ORKTaskViewController: whitespace
Misc: homogenize for the more common 'cannot' instead of 'can not' in exception messages
Misc: whitespace between '==' operator
Misc: some additional constraint homogeneization of recently merged active tasks
Misc: remove needless empty class extensions
Misc: use 'has' instead of 'have' when refering to singular noun
ORKFormItemCell: use VerticalMargin and HorizontalMargin const names
Misc: remove space between '!' unary operator and operand
Misc: use property syntax for accessing 'font', 'ascender', 'descender', and 'window'
Misc: use property syntax for 'allValues' and 'allKeys'
ORKDataLogger: use previous configuration file key for backwards compatibility
...
2015-09-24 07:19:45 -04:00
66b7806bce
Merge branch 'master' into ValidatedText
...
* master: (114 commits)
ResearchKit Project: add explicit 'ORK_LOG_LEVEL_WARNING=1'
ORKImageSelectionView: resolve merge conflict
ORKTest: fix column width not being updated after rotation
ORKImageCaptureStepViewController: restore 'queue_' method prefix
ORKTappingContentView: slight constraint refactor
ORKSkin: hide 'ORKGetMetricForScreenType()' function; use 'ORKGetMetricForWindow()' instead
Misc: remove extra newlines before 'else'
Misc: remove additional space after '!' unary operator
Misc: homegenize whitespace between consecutive closing and opening brackets
ORKTaskViewController: whitespace
Misc: homogenize for the more common 'cannot' instead of 'can not' in exception messages
Misc: whitespace between '==' operator
Misc: some additional constraint homogeneization of recently merged active tasks
Misc: remove needless empty class extensions
Misc: use 'has' instead of 'have' when refering to singular noun
ORKFormItemCell: use VerticalMargin and HorizontalMargin const names
Misc: remove space between '!' unary operator and operand
Misc: use property syntax for accessing 'font', 'ascender', 'descender', and 'window'
Misc: use property syntax for 'allValues' and 'allKeys'
ORKDataLogger: use previous configuration file key for backwards compatibility
...
Conflicts:
ResearchKit/Common/ORKAnswerFormat.m
2015-09-24 07:18:44 -04:00
c79b228fba
Merge branch 'master' into WaitTask
...
* master: (114 commits)
ResearchKit Project: add explicit 'ORK_LOG_LEVEL_WARNING=1'
ORKImageSelectionView: resolve merge conflict
ORKTest: fix column width not being updated after rotation
ORKImageCaptureStepViewController: restore 'queue_' method prefix
ORKTappingContentView: slight constraint refactor
ORKSkin: hide 'ORKGetMetricForScreenType()' function; use 'ORKGetMetricForWindow()' instead
Misc: remove extra newlines before 'else'
Misc: remove additional space after '!' unary operator
Misc: homegenize whitespace between consecutive closing and opening brackets
ORKTaskViewController: whitespace
Misc: homogenize for the more common 'cannot' instead of 'can not' in exception messages
Misc: whitespace between '==' operator
Misc: some additional constraint homogeneization of recently merged active tasks
Misc: remove needless empty class extensions
Misc: use 'has' instead of 'have' when refering to singular noun
ORKFormItemCell: use VerticalMargin and HorizontalMargin const names
Misc: remove space between '!' unary operator and operand
Misc: use property syntax for accessing 'font', 'ascender', 'descender', and 'window'
Misc: use property syntax for 'allValues' and 'allKeys'
ORKDataLogger: use previous configuration file key for backwards compatibility
...
2015-09-24 07:12:18 -04:00
0398fb3767
Add margins using ORKStandardHorizontalMarginForView.
2015-09-24 12:19:41 +02:00
f168e02e9e
Merge master and fix conflicts.
2015-09-24 11:44:43 +02:00
5d1ed481e3
Add margin for pegs.
2015-09-24 10:17:22 +02:00
7cd75c4d40
PR updates.
2015-09-23 18:01:33 -07:00
aa58b643a0
Merge remote-tracking branch 'upstream/master' into screening
2015-09-23 16:53:20 -07:00
3b0ce6478b
PR changes.
2015-09-23 16:53:04 -07:00
c545aa8cbb
Merge pull request #449 from rsanchezsaez/rsanchezsaez-logging
...
Revamp logging system
2015-09-23 16:37:24 -07:00
74ff026b92
ResearchKit Project: add explicit 'ORK_LOG_LEVEL_WARNING=1'
...
Adds explicit warning log level to 'Debug' and 'Release' 'Preprocessor Macros' setting in Xcode's Build Settings.
2015-09-24 00:07:40 +01:00
257ee610b7
Added authenticationPasscodeType property for factory view controller support.
2015-09-23 15:29:06 -07:00
79b9351433
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules
2015-09-23 21:38:23 +01:00
359f8f3387
ORKImageSelectionView: resolve merge conflict
2015-09-23 21:37:50 +01:00
1f7c856fdb
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-logging
...
# Conflicts:
# ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.m
# ResearchKit/ActiveTasks/ORKTowerOfHanoiStep.m
# ResearchKit/Common/ORKImageSelectionView.m
# ResearchKit/Common/ORKTaskViewController.m
# ResearchKit/Consent/ORKEAGLMoviePlayerView.m
2015-09-23 21:37:24 +01:00
58a5a2c3b2
Merge pull request #474 from rsanchezsaez/rsanchezsaez-ORKTest
...
ORKTest: fix column width not being updated after rotation
2015-09-23 12:50:26 -07:00
54f064247e
Merge pull request #343 from rsanchezsaez/rsanchezsaez-constraints
...
Constraint code homogenization
2015-09-23 12:50:17 -07:00
3f35a49f50
ORKTest: fix column width not being updated after rotation
...
Also: make scroll view to use 3 columns for view widths equal or greater than the iPhone 6 in landscape (667 points).
2015-09-23 20:24:12 +01:00
c16c929054
Updated Attributions.
2015-09-23 10:08:58 -04:00
be6a922554
Updated Attributions.
2015-09-23 10:07:40 -04:00
3711ab342c
Release Notes: split iPad and iPhone Landscape support into two items
2015-09-23 00:36:07 +01:00
908f7b0f5f
ORKImageCaptureStepViewController: restore 'queue_' method prefix
2015-09-23 00:30:49 +01:00
1be6949c2d
Release Notes: added contributions attribution
2015-09-23 00:21:17 +01:00
fc4e8a9915
PR updates.
2015-09-22 16:15:07 -07:00
413e607258
PR changes.
2015-09-22 16:08:01 -07:00
7847c813a5
Added Location Question to ORKTest.
2015-09-22 18:39:23 -04:00
956549c320
Initial commit for location question.
...
Includes:
Location Question
Location Question Answer Format
Location Question Form Cell
Location Survey Answer
2015-09-22 18:16:08 -04:00
709e4b818c
Merge branch 'master' into WaitTask
...
* master:
Fixes #465
2015-09-22 16:44:23 -04:00
8a6f0a35bd
Merge branch 'master' into ValidatedText
...
* master:
Fixes #465
2015-09-22 16:44:12 -04:00
b218db0f63
Merging master
2015-09-22 12:52:33 -07:00
8fe483a5e0
Merging master
2015-09-22 12:44:31 -07:00
3a555592ff
PR changes.
2015-09-22 12:38:13 -07:00
4fb39abac9
Release Notes: indent Result Predicates-related paragraph
2015-09-22 19:50:50 +01:00
fbaf85ae9b
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-changelog
2015-09-22 19:48:54 +01:00
11a0427883
Merge pull request #470 from shazino/fix-#465
...
Increase tapping timestamp precision
2015-09-22 10:55:16 -07:00
d23e188d64
Fixes #465
2015-09-22 09:39:55 +02:00
d70ee216c8
Added Validated text to ORKTest App, updated to support validators.
2015-09-21 21:14:26 -04:00
0cd42556f5
Initial Validated Text Commit
2015-09-21 21:07:52 -04:00
3daec83a7f
ORKTest App updated with WaitTask.
2015-09-21 20:41:21 -04:00
ed44fd84d9
ORKTappingContentView: slight constraint refactor
2015-09-22 01:28:30 +01:00
be9d2e3486
Wait Task Initial Commit
2015-09-21 20:21:01 -04:00
dc78de8fdd
ORKSkin: hide 'ORKGetMetricForScreenType()' function; use 'ORKGetMetricForWindow()' instead
...
This is simpler to understand and easier to maintain. It handles all 'nil' window cases in one place.
2015-09-22 01:14:07 +01:00
21f1dbb5af
Misc: remove extra newlines before 'else'
2015-09-22 00:55:14 +01:00
7bc31391fa
Misc: remove additional space after '!' unary operator
2015-09-22 00:53:22 +01:00
e932d118b9
Misc: homegenize whitespace between consecutive closing and opening brackets
2015-09-22 00:52:36 +01:00
874386987a
ORKTaskViewController: whitespace
2015-09-22 00:49:00 +01:00
2b27a9d038
Misc: homogenize for the more common 'cannot' instead of 'can not' in exception messages
2015-09-22 00:47:17 +01:00
293e0ed23c
Misc: whitespace between '==' operator
2015-09-22 00:43:04 +01:00
c322e0455d
Misc: some additional constraint homogeneization of recently merged active tasks
2015-09-22 00:41:04 +01:00
9960b4376f
Misc: remove needless empty class extensions
2015-09-22 00:29:24 +01:00
1d3adbba45
Misc: use 'has' instead of 'have' when refering to singular noun
2015-09-22 00:26:46 +01:00
07d1aba216
ORKFormItemCell: use VerticalMargin and HorizontalMargin const names
2015-09-22 00:09:16 +01:00
b69d40a86b
Misc: remove space between '!' unary operator and operand
2015-09-21 23:49:18 +01:00
633f9eaaef
Misc: use property syntax for accessing 'font', 'ascender', 'descender', and 'window'
2015-09-21 23:44:50 +01:00
2edf7bc481
Misc: use property syntax for 'allValues' and 'allKeys'
2015-09-20 17:30:22 +01:00
92620b782b
ORKDataLogger: use previous configuration file key for backwards compatibility
2015-09-20 17:09:01 +01:00
06ca255bb1
Misc: remove 'k' prefix from constants (as per the Coding Style Guide)
2015-09-20 16:51:29 +01:00
5baa3a423a
Misc: more binary operator whitespace fixes
2015-09-20 16:37:39 +01:00
b56e622ea0
Misc: use property format for accessing screen 'scale'
2015-09-20 16:34:33 +01:00
9fad01dd0c
Misc: homogenize whitespace around binary operators
...
Also remove the 'k' prefix on some constants.
2015-09-20 16:32:34 +01:00
f2c751a71f
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
2015-09-20 16:08:43 +01:00
06d9244c80
RELEASE-NOTES.md: add notes about 'scale answer format' and 'result predicate' improvements in v1.2
...
Also use the proper 'Scale Answer Format' name (instead of 'Slider Answer Format').
2015-09-20 15:35:28 +01:00
6004058c50
RELEASE-NOTES.md: add notes on required Xcode version
2015-09-20 15:13:18 +01:00
29f883b04b
Refactored for ResearchKit 1.2 Compatibility
2015-09-20 09:12:01 +02:00
cc1e1ae435
RELEASE-NOTES.md: fix indentation of task descriptions
2015-09-18 12:34:42 +01:00
be6d351bb3
Merge pull request #459 from YuanZhu-apple/master_fix_consent_animation
...
Fix consent animation.
2015-09-17 17:58:02 -07:00
eac89e0119
Fix typo and rearrange some restoreGLContext code
2015-09-17 17:56:12 -07:00
e035236314
Add 'RELEASE-NOTES.md'
2015-09-18 00:56:10 +01:00
870a9f6ac5
Merge branch 'master' of https://github.com/ResearchKit/ResearchKit
2015-09-17 13:10:03 +02:00
ea0c6a1cf8
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
...
# Conflicts:
# ResearchKit/Consent/ORKConsentReviewController.m
2015-09-17 02:00:00 +01:00
48cc58f04c
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules
2015-09-17 01:46:03 +01:00
30a346e94d
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-documentationformatting
2015-09-17 01:45:30 +01:00
6c97c550ed
ORKEAGLMoviePlayerView: promote OpenGL failure messages from warning to error
2015-09-17 01:20:03 +01:00
50b3f1d170
ORKTaskViewController, ORKStepViewController: replace 'NSLog' by 'ORK_Log_Warning'
2015-09-17 01:19:24 +01:00
601b16a985
Refactored PasscodeTextField logic.
2015-09-16 14:27:09 -07:00
ecb0fde9c5
Merge remote-tracking branch 'ResearchKit/master'
2015-09-16 17:40:17 +02:00
81be7627eb
Fix consent animaton.
...
Root cause: old playerView's dealloc happens on the new EAGLContext(wrong) of new playerView.
Save/Restore EAGLContext in each of the methods which do GL drawing.
This make more than one GLContext lives together.
2015-09-15 18:18:56 -07:00
f94929daae
Added optional error message property.
2015-09-15 11:03:43 -07:00
8d7ab7861c
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-logging
2015-09-15 15:03:05 +02:00
ce3f17d45f
Release 1.2.1 with Fix blank consent html review page.
2015-09-14 15:53:06 -07:00
1354181f84
Merge pull request #457 from YuanZhu-apple/master_fix_blank_consent_review
...
Fix `blank` consent html review page.
2015-09-14 15:41:17 -07:00
395d2727c6
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
2015-09-14 23:49:40 +02:00
7f67d9c4da
Merge pull request #440 from rsanchezsaez/rsanchezsaez-master-charts
...
Charts: add 'graphChartView:drawsVerticalReferenceLineAtPointIndex:' method
2015-09-14 14:20:19 -07:00
2c5b5cda7d
Merge pull request #438 from rsanchezsaez/rsanchezsaez-master-ORKTest
...
ORKTest: add icon and launch xib
2015-09-14 14:19:48 -07:00
4fd95efe57
Merge pull request #450 from rsanchezsaez/rsanchezsaez-documentation
...
ORKAnswerFormat: fix headerdoc warnings
2015-09-14 14:19:03 -07:00
fb223bb1bb
Fix blank consent html review page.
2015-09-14 13:58:30 -07:00
831f136cd1
Added ability to recover answer and changed label type for form item cell.
2015-09-14 13:27:05 -07:00
6ad9ad52af
Minor fix.
2015-09-13 14:47:25 -07:00
b28d5e6456
Minor fixes.
2015-09-13 14:45:15 -07:00
d7f9987ede
Added eligibility answer format.
2015-09-13 14:19:14 -07:00
86aaeae857
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
...
# Conflicts:
# ResearchKit/ActiveTasks/ORKAudioContentView.m
# ResearchKit/Common/ORKImageCaptureView.m
2015-09-11 00:45:38 +01:00
642bc3db80
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2015-09-11 00:36:07 +01:00
7361442a04
Programming Guide: add formatting for keywords and hard-wrap at line 100
2015-09-11 00:03:54 +01:00
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
af0ca497d5
ORKAnswerFormat: fix headerdoc wanings
...
Also: hard wrap documentation at line 100.
2015-09-10 23:47:31 +01:00
75f62ee5f7
Merge pull request #448 from YuanZhu-apple/master_add_workspace
...
Add a single workspace that includes RK, ORKTest, and ORKCatalog for convenience
2015-09-10 15:26:08 -07:00
bd63d1576b
Minor fix.
2015-09-10 15:22:28 -07:00
a4c521203c
Merge pull request #443 from rsanchezsaez/rsanchezsaez-OptionalFormItems
...
ORKFormItem: implement 'optional' property
2015-09-10 14:58:17 -07:00
b8aba5459e
Refactored keychain wrapper and added unit tests.
2015-09-10 14:51:49 -07:00
f0507b973f
ORKHelpers: add my copyright info to the header
2015-09-10 22:44:34 +01:00
58a9366bf5
Programming Guide: rename logging section to Logging Errors and Warnings
2015-09-10 22:35:23 +01:00
5b298d17a7
ORKHelpers: fix 'ORK_LOG_LEVEL_NONE' not working
2015-09-10 22:12:37 +01:00
bca3ceae78
Programming Guide: add 'Logging Level' section
2015-09-10 22:06:45 +01:00
d8c0ecbd1d
ORKHelpers: revamped logging system
...
Also:
- Changes some (mildly) serious error messages from the DEBUG to the WARNING level.
- Remove the line number from ORK logging as it's noisy (we already have the function).
---
There are now four logging levels controlled by 4 preprocessor macros and their corresponding logging macros:
- ORK_LOG_LEVEL_NONE
- ORK_LOG_LEVEL_DEBUG, ORK_Log_Debug()
- ORK_LOG_LEVEL_WARNING, ORK_Log_Warning()
- ORK_LOG_LEVEL_ERROR, ORK_Log_Error()
Setting the ORK_LOG_LEVEL_NONE macro to 1 completely silences all RK logs. Setting ORK_LOG_LEVEL_DEBUG, or one of the higher levels, to 1, enables logging at that level and at all the higher levels.
If you do not specify a log level, 'ORK_LOG_LEVEL_WARNING=1' is used by default.
You have to set this preprocessor macros to your ResearchKit subproject, not to your main project. You can do so in Xcode by adding any of them to the 'Preprocessor Macros' list on your ResearchKit target's Build Settings.
See this resources if you are using ResearchKit through CocoaPods and need to change the log level:
- http://www.mokacoding.com/blog/cocoapods-and-custom-build-configurations/
- http://stackoverflow.com/a/30038120/269753
2015-09-10 21:39:15 +01:00
133b154023
Add a single workspace that includes RK, ORKTest, and ORKCatalog for convenience
2015-09-10 13:10:51 -07:00
95baa8b943
Update README.md
...
Stable branch works with Xcode 7.0 compatible now.
2015-09-09 17:14:52 -07:00
0e433640c4
Merge branch 'stable'
2015-09-09 17:12:21 -07:00
1ae771ee80
ORKFormStep: rename 'non-optional' to 'required' on headerdocs and ORKTest's visible strings
...
It's the recommended practice for expressing non-optionality according to RFC 2119 (https://www.ietf.org/rfc/rfc2119.txt ).
2015-09-09 10:49:20 +01:00
c5b14925bd
Merge remote-tracking branch 'ResearchKit/master'
...
Syncing fork
2015-09-09 10:30:36 +02:00
fa40e30ee3
Updated documentation.
2015-09-08 18:37:13 -07:00
8736dd5165
Merge remote-tracking branch 'upstream/master' into touchID
2015-09-08 17:54:40 -07:00
4917b34291
ORKFormItem: set 'optional' default value to 'YES'
...
Also adds headers to the 'Optional Form' example.
2015-09-09 01:51:36 +01:00
29d3e0da89
Renamed ORKKeychainStore to ORKKeychainWrapper.
2015-09-08 17:49:11 -07:00
9b68f5188f
Enhancements to keychain store.
2015-09-08 17:31:59 -07:00
ed3503370d
ORKDiscreteGraphChartView: fix small typo
2015-09-09 01:20:49 +01:00
43480170aa
ORKFormItem: implement 'optional' property
...
Also add 'ORKCatalog' example.
2015-09-08 23:52:11 +01:00
fdaf18198f
Consolidated delegates, updated API, and minor fixes.
2015-09-08 13:57:36 -07:00
aee5c48875
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-master-charts
...
# Conflicts:
# ResearchKit/Charts/ORKGraphChartView.h
# Testing/ORKTest/ORKTest/Charts/ChartDataSources.swift
# samples/ORKCatalog/ORKCatalog/Charts/ChartDataSources.swift
2015-09-08 20:38:33 +01:00
521715f7dd
Added keychain for passcode storing.
2015-09-08 11:12:06 -07:00
68572aefe2
Merge branch 'convergence'
2015-09-08 10:50:52 -07:00
731b65d65c
ORKCatalog: update graphChartView(graphChartView:, titleForXAxisAtPointIndex:)' method to use new name
2015-09-08 10:00:10 +01:00
b584258946
Use ORKLocalizedStringFromNumber()
...
# Conflicts:
# Testing/ORKTest/ORKTest/Charts/ChartDataSources.swift
2015-09-08 09:55:28 +01:00
d46ab216f4
ORKGraphChartView: implement 'graphChartView:drawsVerticalReferenceLineAtPointIndex:' method
2015-09-08 01:55:55 +01:00
b6bee7e9de
ORKGraphChartView: fix accessibility crash when 'graphChartView:titleForXAxisAtPointIndex:' is not implemented
...
# Conflicts:
# ResearchKit/Charts/ORKGraphChartView.h
2015-09-08 01:55:41 +01:00
7272291eb7
ORKTest: add new icon
2015-09-07 23:08:09 +01:00
57be36482c
ORKTest: nicer LaunchScreen
2015-09-07 00:34:38 +01:00
c7d180b3ad
Misc: update '__nullable' annotations to '_Nullable' (Xcode 7 style)
...
Also remove unneeded nullability annotations from implementation files.
2015-09-07 00:05:42 +01:00
ed6913e2ad
ORKHeadlineLabel: access 'windows' using property syntax
2015-09-06 23:29:13 +01:00
9f79e144ce
ORKScaleAnswerFormat: small whitespace fix
2015-09-06 23:18:39 +01:00
185789dfb3
ORKScaleSliderView: homogenize text choice slider constraints
...
Also, related to text choice slider:
- Move label-creating code to init.
- Do not create needless views on init.
- Other small improvements.
2015-09-06 23:08:50 +01:00
5445b67b41
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
...
# Conflicts:
# ResearchKit/Common/ORKScaleSlider.m
# ResearchKit/Common/ORKScaleSliderView.m
2015-09-06 22:28:08 +01:00
66286a80c9
Merge pull request #435 from YuanZhu-apple/master_add_text_init
...
Add another convenient constructor for ORKQuestionStep
2015-09-04 15:42:44 -07:00
d9addcf469
Removing custom keyboard.
2015-09-04 12:32:40 -07:00
7ba00fb853
Remove extra .
2015-09-04 11:29:43 -07:00
e4e2626823
Add another convenient constructor for ORKQuestionStep
...
The `text` attribute is easy missed by developers.
2015-09-04 11:27:56 -07:00
48178b01c2
Merged master and added accessibility support.
2015-09-04 10:57:35 -07:00
8b847e4de0
Merge pull request #392 from umerkhan-apple/textSlider
...
IOI # 230 - Text scale slider
2015-09-04 10:54:37 -07:00
2a76ff2a2e
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
...
# Conflicts:
# ResearchKit/ActiveTasks/ORKTappingContentView.m
# ResearchKit/ActiveTasks/ORKToneAudiometryContentView.m
# ResearchKit/ActiveTasks/ORKTowerOfHanoiTowerView.m
# ResearchKit/Common/ORKFormItemCell.m
# ResearchKit/Common/ORKHelpers.m
# ResearchKit/Common/ORKScaleSliderView.m
# ResearchKit/Common/ORKSkin.h
# ResearchKit/Common/ORKSkin.m
# ResearchKit/Common/ORKVerticalContainerView.m
# ResearchKit/Consent/ORKConsentReviewController.m
# ResearchKit/Consent/ORKConsentSignatureController.m
# ResearchKit/Consent/ORKSignatureView.m
# Testing/ORKTest/ORKTest/MainViewController.m
2015-09-04 18:38:40 +01:00
caa24b9ae6
Restore Tapping Content View.
2015-09-04 16:45:27 +02:00
0a3d938f8a
Restore Tapping Content View.
2015-09-04 16:43:08 +02:00
1ea4960c29
Merge remote-tracking branch 'ResearchKit/master'
...
Sync with remote repo.
2015-09-04 15:36:40 +02:00
7013e954bc
Merge remote-tracking branch 'origin/master' into 9hpt-task
...
Merge master to fix conflicts.
2015-09-04 15:29:07 +02:00
ec8c36260c
Improve legibility.
2015-09-04 15:17:34 +02:00
cfeb39ef5c
Merge pull request #1 from rsanchezsaez/rsanchezsaez-holepegtask
...
Hole Peg Test Task images
2015-09-04 11:37:28 +02:00
b56bda5aaa
Updating constraint merge conflict.
2015-09-03 23:53:30 -07:00
a9857da213
Minor formatting updates.
2015-09-03 23:44:56 -07:00
3b3ec14acd
Merge master
2015-09-03 23:35:26 -07:00
c499309897
Minor formatting updates.
2015-09-03 22:24:59 -07:00
b813690c67
Minor enhancements
2015-09-03 21:29:18 -07:00
714f29e185
Merge pull request #432 from rsanchezsaez/rsanchezsaez-master-ORKTest
...
ORKTest: project files reorganization
2015-09-03 18:26:58 -07:00
d752d4d926
Merge pull request #420 from rsanchezsaez/master-Catalog
...
Reorganize 'ORKCatalog' into subsections
2015-09-03 18:15:50 -07:00
050cea0c51
Refactored protocol method name.
2015-09-03 17:55:45 -07:00
5a20aeab03
Added custom numeric pad keyboard.
2015-09-03 17:54:49 -07:00
748d13e56e
ORKCatalog: update 'readme.md' to add formatting and information about sections
2015-09-04 00:54:23 +01:00
e9f3bc919b
ResultTableViewProviders: reorder code to match TaskListRow
2015-09-04 00:53:34 +01:00
b17dda9697
ORKCatalog: reorganize project files so they are easier to browse
2015-09-04 00:32:56 +01:00
729ef4fa58
TaskListRow: reorder 'form task' in front of 'survey task' (alphabetically)
2015-09-04 00:22:57 +01:00
e9cc5ea800
Merge branch 'master' of github.com:ResearchKit/ResearchKit into master-Catalog
...
# Conflicts:
# samples/ORKCatalog/ORKCatalog/Tasks/TaskListRow.swift
2015-09-04 00:21:00 +01:00
090b976083
ResearchKit unit tests: remove needless framework directory
...
(It caused a warning when running them.)
2015-09-03 22:32:57 +01:00
bd32b0ad24
ORKTest: remove needless framework directory
...
(It caused a warning when running unit tests.)
2015-09-03 22:32:30 +01:00
d86edbc3f2
ORKTest: file structure reorganization so the project is easier to browse
2015-09-03 22:31:40 +01:00
a7c7aa7466
Adding UI foundation for custom numeric keyboard.
2015-09-03 13:40:43 -07:00
72da218778
Add Accessibility section to CONTRIBUTING.md
2015-09-02 17:44:47 -07:00
89571ef876
Merge pull request #426 from rsanchezsaez/rsanchezsaez-master-ORKTest
...
Use sectioned 'UICollectionView' for presenting buttons in 'ORKTest'
2015-09-02 17:27:07 -07:00
dc6bb27f57
Merge pull request #416 from rsanchezsaez/rsanchezsaez-FormPredicates
...
Result predicates: add support for form item results and nil results
2015-09-02 17:12:43 -07:00
1c200251e8
ORKResultPredicate: update remaining headerdoc comments to reflect the new 'result selector' name
2015-09-03 01:11:50 +01:00
bdad58b3a7
ORKCatalog: add copyright info and fix leading space omission to the copyright headers
2015-09-03 00:14:53 +01:00
c79b0eebe9
ORKTest: move 'Mini Form' and 'Selection Survey' to the 'Question Steps' section
...
Also adds copyright information.
2015-09-03 00:11:43 +01:00
de05c7a632
ORKTest: use sectioned UICollectionView to organize test buttons
2015-09-02 23:21:54 +01:00
0d07828edc
ORKTest: fix storyboard warnings
2015-09-02 23:19:19 +01:00
527609982a
Merge branch 'convergence'
2015-09-02 14:35:36 -07:00
01cb0e77be
PR updates.
2015-09-02 11:13:50 -07:00
1fdd29c308
Adding example in main view controller and minor updates.
2015-09-02 10:54:02 -07:00
b6e185284b
Minor update to consent.
2015-09-01 17:44:05 -07:00
ade8879d54
Refacted factory methods of ORKPasscodeStepViewController into ORKPasscodeViewController
2015-09-01 17:35:08 -07:00
015be2da3a
ORKCatalog: replace 'Survey Questions' indentation by a new section
2015-09-02 00:56:20 +01:00
2650360476
ORKCatalog: reorganize into alphabetically-sorted sections mirroring the project's readme
2015-09-02 00:02:53 +01:00
d42e7eca38
Adding protocol methods.
2015-09-01 14:42:00 -07:00
074a00e2ae
ORKResultPredicate: refactor 'ORKResultIdentifier' class by renaming it to 'ORKResultSelector'
...
Also:
- Improve documentation.
- Update ORKTest example and unit tests.
2015-09-01 22:34:21 +01:00
f7b8901fd2
Merge pull request #384 from rsanchezsaez/rsanchezsaez-codingstyleguide
...
Coding Style Guide: add 'Nullability Annotations' section
2015-09-01 14:04:24 -07:00
c01d530cde
ORKCatalog: use new enum to String conversion for identifiers
2015-09-01 20:53:07 +01:00
ceec6adf1a
ORKResultPredicate: greatly simplified API by introducing the 'ORKResultIdentifier' wrapper class
...
Also:
- Update tests.
- Update 'Navigable ordered task' example.
2015-09-01 00:56:22 +01:00
dffbaeee6b
ORKResultPredicate: make ORKChoiceQuestionResult predicates to accept any kind of answer object (instead of just strings)
...
Also:
- Fixed problem in nil answer result predicate methods.
- Updated 'ORKTest' example.
- Updated test cases.
- Removed needless predicate convenience method test cases.
2015-08-31 21:45:54 +01:00
c45d2cb856
ORKResultPredicate: use '==' instead of 'like' for plain string comparisons
...
(We don't generally want to match wildcard characters.)
2015-08-31 20:38:41 +01:00
7e5b5b45ec
Minor updates for authentication flow.
2015-08-31 12:34:09 -07:00
739d22b5d3
ORKResultPredicate: small headerdoc improvement
2015-08-31 05:53:46 +01:00
070f449c57
Added more passcode flows.
2015-08-30 20:58:25 -07:00
f76c960846
ORKResultPredicate: add 'predicateForNilQuestionResultWithTaskIdentifier:stepIdentifier:resultIdentifier:' method to match results with a nil answer (skipped steps or unanswered form questions)
2015-08-31 00:31:01 +01:00
a5640cb4b1
ORKResultPredicate: add optional 'stepIdentifier' argument to all method, to allow matching form item results.
...
Also: use new methods in newly added form predicate.
Result predicates without a supplied 'stepIdentifier' argument now only match the corresponding question step result, but not any form item result.
2015-08-31 00:03:41 +01:00
1c0ac116d1
Backport slider fixes for Xcode 6
2015-08-30 23:36:52 +01:00
222c017e0d
ORKTaskTests: add some form result predicate tests
2015-08-30 21:14:51 +01:00
90c9e1de94
ORKCatalog: fix form step using wrong identifier
2015-08-30 21:13:57 +01:00
e8bd259952
Merge remote-tracking branch 'upstream/master' into textSlider
2015-08-28 16:57:35 -07:00
07736ac5f3
Fixed secureCoding initializer warning.
2015-08-28 16:54:55 -07:00
21bb2884b5
Laying foundation for different types of passcode flows.
2015-08-28 16:47:47 -07:00
b323bd8980
Added Touch ID and other minor updates.
2015-08-28 16:07:41 -07:00
f5e2f54979
Removed step progress from navigation item title.
2015-08-28 12:55:01 -07:00
39ef6a21f0
Overriding vertical class keyboard methods.
2015-08-28 12:17:23 -07:00
215e4d6008
PR updates.
2015-08-27 21:23:09 -07:00
674a131060
Added foundation for Passcode Step
2015-08-27 18:54:29 -07:00
778e8571d2
ORKStepNavigationRule: make ObjC separate array initializers unavailable in Swift (in favor of the array of tuples initializer)
2015-08-26 21:52:01 +01:00
e71356805c
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules
...
# Conflicts:
# ResearchKit/Common/ORKStepNavigationRule_Private.h
2015-08-26 21:40:52 +01:00
25612dc872
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
...
# Conflicts:
# ResearchKit/ActiveTasks/ORKFitnessContentView.m
# ResearchKit/ActiveTasks/ORKTappingContentView.m
# ResearchKit/ActiveTasks/ORKToneAudiometryContentView.m
# ResearchKit/ActiveTasks/ORKTowerOfHanoiTowerView.m
# ResearchKit/ActiveTasks/ORKWalkingTaskStepViewController.m
# ResearchKit/Common/ORKContinueButton.m
# ResearchKit/Common/ORKFormItemCell.m
# ResearchKit/Common/ORKFormStepViewController.m
# ResearchKit/Common/ORKHeadlineLabel.m
# ResearchKit/Common/ORKImageCaptureStepViewController.m
# ResearchKit/Common/ORKImageCaptureView.m
# ResearchKit/Common/ORKInstructionStepView.m
# ResearchKit/Common/ORKQuestionStepViewController.m
# ResearchKit/Common/ORKResult.m
# ResearchKit/Common/ORKSkin.m
# ResearchKit/Common/ORKStepHeaderView.m
# ResearchKit/Common/ORKSubheadlineLabel.m
# ResearchKit/Common/ORKVerticalContainerView.m
# ResearchKit/Common/ORKVerticalContainerView_Internal.h
# ResearchKit/Consent/ORKConsentSignatureController.m
# ResearchKit/Consent/ORKVisualConsentStepViewController.m
# Testing/ORKTest/ORKTest/DynamicTask.m
2015-08-26 00:41:48 +01:00
8087810ac2
Coding Style Guide: improve 'Spaces in Declarations' subsection
2015-08-25 20:59:13 +01:00
3e99ad04c7
Coding Style Guide: add 'Lightweight Generics' section
2015-08-25 20:57:15 +01:00
0a1eb9c8a2
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-codingstyleguide
2015-08-25 20:23:43 +01:00
c11e70585a
Minor updates.
2015-08-24 14:35:14 -07:00
045abdd919
Adding type to textChoices and removing NSArray validation for textChoices.
2015-08-24 14:23:05 -07:00
f9ffd5e5f1
Minor changes.
2015-08-24 12:12:24 -07:00
407a3da80e
Added serialization and secure coding tests, with some minor fixes.
2015-08-24 11:57:54 -07:00
c786ed06e1
Merge pull request #389 from rsanchezsaez/rsanchezsaez-readme
...
README.md improvements
2015-08-23 21:25:51 -07:00
2765fa5575
README.md: improvements
...
- Simplify introduction bullet list links.
- Use proper sentences surrounding links to in-depth documentation.
- Replace all instances of 'researchkit.github.io' by 'researchkit.org'.
2015-08-24 02:43:24 +01:00
835df17c5a
README.md: small improvements
2015-08-24 02:23:28 +01:00
68e0c685db
Hole Peg Test Task: improve introduction image
2015-08-24 02:11:55 +01:00
352fa46668
Hole Peg Test Task: add new instruction images
...
(Adds pinching fingers to the diagrams.)
2015-08-24 01:41:56 +01:00
87d8db3218
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-codingstyleguide
2015-08-24 00:15:09 +01:00
458f290956
Coding Style Guide: fix small grammar issue
2015-08-23 20:13:52 +01:00
f8c492aadd
Merge remote-tracking branch 'upstream/master' into textSlider
2015-08-20 11:31:41 -07:00
22bcc07047
Added ORKTextScaleAnswerFormat
2015-08-20 11:31:20 -07:00
ca7479609c
Update README.md
2015-08-20 11:31:14 -07:00
d1adbf1f50
Merge branch 'convergence'
2015-08-20 11:13:06 -07:00
321b19adbe
Coding Style Guide: add 'Nullability Annotations' section
...
Also:
- Make new separate section for Header File Example.
- Other very small fixes.
2015-08-19 23:42:28 +01:00
d86fba5c56
ORKPredicateStepNavigationRule: add Swift initializer that takes an array of tuples (result predicate, destination step identifier) instead of two arrays
...
Add sample code to ORKTest: move Navigable Ordered Task creation to Swift and use the overlay Swift initializer for creating the predicate step navigation rules.
2015-08-19 21:58:24 +01:00
9614d50af9
Merge pull request #377 from chb/feature/consent-signing
...
Consent section: avoid headers without body
2015-08-18 21:54:27 -07:00
42f9f6f03d
Merge branch 'master' into feature/consent-signing
2015-08-19 06:47:00 +02:00
43e4ae11b2
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
...
# Conflicts:
# ResearchKit/ActiveTasks/ORKWalkingTaskStepViewController.m
# ResearchKit/Common/ORKScaleSliderView.m
# Testing/ORKTest/ORKTest/CustomRecorder.m
2015-08-18 22:34:31 +01:00
848c4dee8b
Whitespace fix, thanks Xcode :P
2015-08-18 11:23:22 +02:00
a750b2718d
Add omitFromDocument property to consent section
2015-08-18 11:21:21 +02:00
071242f217
Fix whitespace
2015-08-18 00:25:00 +02:00
52aed1a5b6
Use section title in “Learn More” screen
2015-08-17 16:58:33 +02:00
2e736a7306
Consent section: avoid headers without body
2015-08-17 16:21:43 +02:00
217f40e6ec
Merge remote-tracking branch 'upstream/master' into textSlider
2015-08-14 15:10:24 -07:00
3353ff3dd0
Merge remote-tracking branch 'ResearchKit/master'
2015-08-13 16:30:32 +02:00
9e45652356
Fix conflict.
2015-08-13 15:52:19 +02:00
d83e859d84
Fix conflicts.
2015-08-13 15:47:18 +02:00
4195dfe755
Fix conflicts.
2015-08-13 14:57:56 +02:00
55aa48b544
Merge remote-tracking branch 'ResearchKit/master' into 9hpt-task
2015-08-13 14:45:43 +02:00
5d3c846ed7
Add french localisation.
2015-08-13 11:01:11 +02:00
17c82175c2
Show time.
2015-08-13 10:50:59 +02:00
ddeea33a02
Add tests.
2015-08-13 10:45:18 +02:00
f4d8224164
Add icons.
2015-08-12 14:46:04 +02:00
aa5e5b8394
Add distance result.
2015-08-11 10:36:28 +02:00
f914263d0e
Improve gesture recognition.
2015-08-11 09:30:21 +02:00
d3634439af
Add results and samples.
2015-08-10 18:18:00 +02:00
b509908b2a
Start at first move.
2015-08-07 14:07:29 +02:00
6490a7a8c3
Dominant / Non Dominant.
2015-08-07 13:23:16 +02:00
162764e508
Right / Left orientation.
2015-08-07 13:17:58 +02:00
5d99a54c58
Update text description when fail.
2015-08-07 12:40:54 +02:00
7252b83ef2
Rename to "Place" Step.
2015-08-07 11:40:49 +02:00
98b6269f11
Update take with translation/rotation thresholds.
2015-08-06 14:50:19 +02:00
b8ee219a5f
Merge branch 'master' of github.com:rsanchezsaez/ResearchKit into rsanchezsaez-constraints
2015-08-06 11:32:16 +02:00
01e8c561bb
Better UI.
2015-08-05 17:24:36 +02:00
71a0646065
Add check success.
2015-08-05 12:23:46 +02:00
c8f5a1ccb6
Add 3 arrows.
2015-08-05 09:14:39 +02:00
2d1c697402
ORKESerialization: refactor NSNumber, NSValue and NSString '*value' methods to property syntax
2015-08-04 15:23:03 +02:00
c96a94c164
Refactor NSNumber, NSValue and NSString '*value' methods to property syntax
2015-08-04 15:22:47 +02:00
41d346853e
Refactor 'value' method syntax to property syntax
2015-08-04 14:16:08 +02:00
ad919639c7
Refactor 'bounds' method syntax to property syntax
2015-08-04 14:10:42 +02:00
5ebcc6d6b5
Refactor 'bytes/mutableBytes/userInfo' method syntax to property syntax
2015-08-04 14:07:30 +02:00
27c084707e
Refactor 'length' method syntax to property syntax
2015-08-04 14:03:50 +02:00
eeae8f3c1d
Refactor 'firstObject/lastObject' method syntax to property syntax
2015-08-04 13:58:46 +02:00
36f86eb607
Refactor '[object description]' method syntax to 'object.description' property syntax
2015-08-04 13:52:23 +02:00
e69460acfe
Refactor '[array count]' method syntax to 'array.count' property syntax
2015-08-04 13:50:00 +02:00
f7be4f6ae2
Add direction indicator.
2015-08-04 13:40:59 +02:00
d7975ec9f2
Add arrow view.
2015-08-04 09:08:19 +02:00
0405f813a2
Added ORKAnswerFormat support for ORKTextScaleSlider
2015-08-03 15:46:20 -07:00
8492334353
Improve design.
2015-08-03 15:57:49 +02:00
20e5e6db03
ORKTowerOfHanoiTowerView & ORKTowerOfHanoiStepViewController: homogenize constraint code
2015-07-30 20:56:09 +02:00
ca442e748d
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
...
# Conflicts:
# ResearchKit/Common/ORKContinueButton.m
# ResearchKit/Common/ORKNavigationContainerView.m
2015-07-30 20:44:23 +02:00
4e6e3c9ad3
ORKFormItemCell: remove needless screenType property and init method argument
2015-07-30 20:25:12 +02:00
eeee427c97
Remaining minor constraint code refactoring
2015-07-30 20:16:49 +02:00
2bc714f05f
ORKScaleSliderView: add informative NSLayoutFormatOptions cast for empty options
2015-07-30 20:16:25 +02:00
a07aa08fd4
ORKQuestionStepViewController: add informative NSLayoutFormatOptions cast for empty options
2015-07-30 20:15:43 +02:00
00ca93e14d
ORKActiveStepViewController: add informative NSLayoutFormatOptions cast for empty options
2015-07-30 20:15:13 +02:00
a5e641185b
ORKTableContainerView: constraint method rename
2015-07-30 20:13:17 +02:00
ba7433dade
ORKSurveyAnswerCellForText: remove needless setNeedsUpdateConstraints
2015-07-30 20:12:39 +02:00
99f4263417
ORKSurveyAnswerCellForScale: constraint code alignment
2015-07-30 19:55:56 +02:00
a5c16f9d0b
ORKSurveyAnswerCellForScale: set layoutMargins outside setUpConstraints
2015-07-30 19:53:54 +02:00
2d82a2a904
ORKImageChoiceLabel: fix error in calculating the intrinsicContentSize
2015-07-30 19:50:57 +02:00
286366333f
ORKSurveyAnswerCellForImageSelection: homogenize constraint code
2015-07-30 19:34:58 +02:00
a90abe74ae
ORKSurveyAnswerCell: constraint code alignment
2015-07-30 19:25:29 +02:00
9e72e3aaeb
ORKStepHeaderView: constraint code alignment
2015-07-30 19:24:01 +02:00
0af4b33056
ORKSpatialSpanMemoryGameView: use ORKScreenMetricMaxDimension instead of magic number
2015-07-30 19:23:44 +02:00
62fc9cc6ea
ORKSignatureView: move width constraint from ORKConsentSignatureWrapperView
2015-07-30 19:17:00 +02:00
2b54f90b97
ORKSkin: guard against nil window on ORKWidthForSignatureView()
2015-07-30 19:08:03 +02:00
cfd1724cb0
ORKConsentSignatureController: fix unsatisfiable constraint warning
2015-07-30 19:07:38 +02:00
f6d9feda07
ORKScaleSliderView: use ivars instead of internal properties and refactor constraint code.
2015-07-30 18:39:57 +02:00
be44b0c39a
ORKReactionTimeContentView: use ivar instead of internal property
2015-07-30 18:38:22 +02:00
5e3f4acd78
ORKQuestionStepViewController: homogenize constraint code
2015-07-30 18:26:14 +02:00
fd4557a8e6
ORKNavigationContainerView: refactor constraint code
...
- Make constraint ivar name clearer.
- Rename updateConstraintConstants to 'updateSkipToContinueButtonConstraint' to reflect that the constraint can get activated/deactivated.
- Call 'setNeedsUpdateConstraints' after 'updateContinueAndSkipEnabled'.
2015-07-30 17:48:26 +02:00
28f4205bcd
ORKInstructionStepView: homogenize constraint code
2015-07-30 17:37:29 +02:00
7b70f5c362
ORKChoiceButtonView & ORKImageSelectionView: refactor constraint code
...
- Homogenize constraint code.
- Simplify ORKImageSelectionView by dropping _invisibleLabel (_choiceLabel takes its functionality).
- Extract constraint setup to its own method.
2015-07-30 17:30:40 +02:00
7f25099acd
ORKImageChoiceLabel: make intrinsicContentSize not to change the label itself
...
(Allows to drop ORKImageSelectionView invisible label.)
2015-07-30 17:25:00 +02:00
fd84d8d893
ORKImageCaptureView: align constraints so they are easier to read
2015-07-30 16:32:28 +02:00
49bee20f8e
ORKImageCaptureStepViewController: extract constraint setup to separate method
2015-07-30 16:29:09 +02:00
49cbb27222
ORKImageCaptureStepViewController: use ivars instead of internal properties
...
Also, rename some variables and method names by naming conventions.
2015-07-30 16:25:34 +02:00
90b4c7b1b6
ORKImageCaptureCameraPreviewView: extract constraint setup to separate method
2015-07-30 16:05:47 +02:00
aa57b8223c
ORKImageCaptureCameraPreviewView: use ivars instead of internal properties
2015-07-30 16:00:03 +02:00
db93a6ddc8
ORKFormStepViewController: homogenize constraint code
2015-07-30 15:57:00 +02:00
41457846e2
ORKFormItemTextCell, ORKFormItemImageSelectionCell & ORKFormItemScaleCell: extract constraint setup to separate method
2015-07-30 15:32:28 +02:00
08f1b8e3d9
ORKFitnessContentView: better constraint onscreen align
2015-07-30 15:31:50 +02:00
dc5460c120
ORKFitnessContentView: homogenize constraint code
2015-07-30 15:21:01 +02:00
6a6cb929e1
ORKQuestionStepCellHolderView: homogenize constraint code
2015-07-30 15:07:46 +02:00
fb56d6b64b
ORKCountdownView: extract constraint setup to its own method
2015-07-30 15:00:45 +02:00
2ed0111866
ORKConsentReviewController: homogenize constraint code
2015-07-30 14:53:58 +02:00
ccc615cea6
ORKConsentLearnMoreViewController: homogenize constraint code
2015-07-30 14:51:17 +02:00
97be632ed8
ORKCompletionStepView: use translatesAutoresizingMaskIntoConstraints property syntax instead of method
2015-07-30 14:49:51 +02:00
588d9b6528
ORKAudioGraphView: extract constraint setup to its own method
2015-07-30 14:48:34 +02:00
4d791e96e3
ORKActiveStepViewController: homogenize constraint code
2015-07-30 14:40:00 +02:00
deaa85ad09
ORKActiveStepQuantityView: add space between binary operators
2015-07-30 14:36:03 +02:00
415a937a7e
ORKTest's MainViewController: homogenize constraint code
2015-07-30 14:31:51 +02:00
e15906aeb8
CustomRecorder: homogenize constraint code
2015-07-30 14:14:11 +02:00
853adebbcd
ORKVerticalContainerView: rename constraint methods
2015-07-30 12:56:43 +02:00
0c39747462
Add first views.
2015-07-30 09:13:30 +02:00
7d9e48a8a6
ORKVerticalContainerView: refactor constraint code
...
- Homogenize code.
- Add constraints by activation.
- Enable autolayout only once for container views.
- Extract static constraint setup to its own method
- Use direct constraint variables instead of dictionary for adjustable constraints.
- Extract some constraint activation/deactivation out from updateConstraintConstants method.
2015-07-29 19:23:10 +02:00
e75f76a1e6
ORKVerticalContainerView: first pass at constraint code homogenization
2015-07-29 18:13:40 +02:00
e5ac86f029
First draft for hpt task.
2015-07-29 09:29:51 +02:00
1ef8b48d2a
ORKWalkingContentView: make constraints static
2015-07-25 14:21:44 +02:00
b19f2e06a8
ORKToneAudiometryContentView: refactor constraint code
...
- Homogenize code.
- Make constraints update after moving to a new window.
2015-07-25 14:13:04 +02:00
8912749a75
ORKTextFieldView: make constraints static
2015-07-24 21:16:30 +02:00
033719036f
ORKTappingContentView: make constraints static and homogenize code
2015-07-24 18:10:39 +02:00
4bde825ba0
Create task in the list
2015-07-24 09:01:43 +02:00
ad5aa9912b
ORKStepHeaderView: use constraint ivars instead of dictionary (clearer and safer)
2015-07-23 20:13:19 +02:00
43c6e8b72b
ORKStepHeaderView: fix issue in which constraints were not correctly updated for the after moving to a new window
2015-07-23 20:02:01 +02:00
650c9154b5
ORKSurveyAnswerCellForTextField: make constraints static
2015-07-23 19:42:33 +02:00
deeec06e03
ORKTableContainerView: make constraints static
2015-07-23 19:09:46 +02:00
2737e60305
ORKSurveyAnswerCellForText: make constraints static and homogenize code
2015-07-23 19:02:24 +02:00
662e2f746b
ORKSurveyAnswerCellForPicker: make constraints static
2015-07-23 18:56:45 +02:00
43488a1145
ORKSurveyAnswerCellForNumber: refactor constraint code
...
- Homogenize code.
- Make constraints static.
- Add constraints by activation.
2015-07-23 16:29:07 +02:00
6d0bd6a66d
ORKStepHeaderView: refactor constraint code
...
- Homogenize code.
- Move initial constraint creation to their own method.
- Add constraints by activation.
- Remove unneeded ivars.
2015-07-23 16:17:13 +02:00
36d57c9419
ORKSpatialSpanMemoryContentView: make constraints static
2015-07-23 14:40:10 +02:00
43c75d6d76
ORKNavigationContainerView: refactor constraint code
...
- Make sure [super updateConstraints] runs last.
- Make most constraints static.
- Add constraints by activation.
- Homogenize code.
2015-07-23 14:25:15 +02:00
d146c50cf0
ORKFormItemTextCell, ORKFormItemImageSelectionCell, ORKFormItemScaleCell: refactor constraint code
...
- Add constraints by activation.
- Homogenize code.
2015-07-16 18:51:09 +02:00
bd6d36fa31
ORKFormItemTextFieldBasedCell: refactor constraint code
...
- Add constraints by activation
- Homogenize code.
2015-07-16 18:41:11 +02:00
27a777a3e7
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
2015-07-15 19:54:08 +02:00
fdedacaa51
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
2015-07-09 15:46:58 +01:00
1ecf1d7027
Merge remote-tracking branch 'ResearchKit/master'
2015-07-08 13:20:44 -07:00
38707d4f67
ORKContinueButton: refactor constraint code
...
- Make most constraints static and lighten updateConstraints.
- Add constraints by activation.
2015-05-29 00:30:58 +01:00
b5b3c61be0
ORKConsentSignatureController: refactor constraint code
...
- Make most constraints static and lighten updateConstraints.
- Add constraints by activation.
2015-05-29 00:29:45 +01:00
64f702b826
ORKActiveStepQuantityView: rename local variable (additionalConstraints -> constraints)
2015-05-28 23:23:18 +01:00
fdef4d29bd
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
...
# Conflicts:
# ResearchKit/Common/ORKVerticalContainerView.m
2015-05-28 23:13:44 +01:00
e6a27ba94a
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
2015-05-20 20:21:49 +01:00
ad72ce7347
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
2015-05-17 21:51:24 +01:00
6b0559b13b
ORKAudioContentView: make constraints static
2015-05-12 02:10:27 +01:00
93bb589eb7
ORKActiveStepTimerView: refactor constraint code
...
- Make most constraints static and lighten updateConstraints
- Add constraints by activatiion
2015-05-12 02:00:22 +01:00
f923bd7fe0
ORKActiveStepQuantityView: avoid a bit of duplicate constraint code; rename 'setupConstraints' to 'setUpConstraints'
2015-05-12 01:55:09 +01:00
af1ed4425c
ORKStepHeaderView & ORKVerticalContainerView: drop '_' prefix from constraint keys
2015-05-12 00:49:19 +01:00
Srinath Tupil Muralidharan
Akshay
Kevin Dang
Sifan Ye
Eric Schramm
Clare Kasemset
Ricardo Sanchez-Saez
Conor Hughes
Josh Avant
Shannon Young
Tobias Jungnickel
Andrzej Naglik
Karim H
Akshay
Macro Yau
Paweł Kowalczyk
akshay-yadav-apple
Anthony Schneider
Daniel Emden
Nino Guba
kelseydedoshka-apple
Chris Ortman
Nino Guba
Pariece McKinney
Shannon Young
Fer
Mike Mertsock
chrisnowak
Ricardo Sanchez-Saez
Joshua McKinnon
Joanna Brodbeck
Kelly Chu
Umer Khan
François Benaiteau
hasiniran
Benjamin Randazzo
Scott Guelich
Dan Berglund
Fernando Waigandt
Steve Moser
Roger Solis
John Saigle
Josh Bruhin
Faraz Hussain
Faraz Hussain
Steve Roy
Oliver Schäfer
DanKeen
coreygans
Faraz Hussain
Roland Rabien
Roland Rabien
Erin Mounts
Andrew Hill
Vincent Tourraine
Malcolm Hall
Darren Levy
Ryan Schneider
Brian Bowman
doreilly
Shannon Young
Yuan Zhu
Yuan Zhu
Sebastian Ricaldoni
Oliver Schäfer
Sam Lichlyter
Joe Carroll
Oliver Schäfer
Gregory Boland
Magnus Wissler
Michal Zaborowski
Ricardo Sánchez-Sáez
Cherry
Jake Krog
Andrew Hill
MDP
Allen Tu
Erin-Mounts
Shannon Young
Everest Liu
Benjamin King
Ben DiFrancesco
Rajit Shinh
Mike Revoir
Sam Falconer
marc hoffman
WEI-JEN TU
Evan D. Schoenberg, M.D
Prayag Verma
Jared Crawford
Pascal Pfiffner
Oliver Schäfer
John Earl
Tom Welsh
Jason Ji
Julien Therier
Ryan J. Liljestrom
Hugues Bernet-Rollande
Nidhi Gupta
Brandon McQuilkin
Steve Cadwallader
Pavel Kanzelsberger
Matteo Crippa
Matteo Crippa
Eric Rolf
Umer Khan
