Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add module for Go/No-Go Visual Reaction Time task #926

Closed
wants to merge 111 commits into from

Conversation

faraz-hussain
Copy link
Contributor

Adds modified version of existing Reaction Time active task that incorporates a Go/No-Go condition, i.e., the participant is instructed not to shake their device every time a green dot is shown instead of a blue one.

syoung-smallwisdom and others added 30 commits August 16, 2016 14:13
…survey

# Conflicts:
#	ResearchKit/Common/ORKOrderedTask.h
#	ResearchKit/Localized/en.lproj/ResearchKit.strings
#	Testing/ORKTest/ORKTest/MainViewController.m
#	samples/ORKCatalog/ORKCatalog/Tasks/TaskListRow.swift
# Conflicts:
#	samples/ORKCatalog/ORKCatalog/Tasks/TaskListRow.swift
…step.

This is useful in displaying disclaimer or copyright information.
# Conflicts:
#	samples/ORKCatalog/ORKCatalog/Tasks/TaskListRow.swift
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.
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
syoung-smallwisdom and others added 27 commits January 30, 2017 13:22
# Conflicts:
#	ResearchKit/Common/ORKOrderedTask.m
# Conflicts:
#	ResearchKit/Common/ORKOrderedTask.h
Updating Go/No-Go code style and eliminating bugs
…er delay to prevent invisible keyboard when user hits ‘cancel’ in touch ID context
Updating Go/No-Go code style and eliminating bugs
Rolling back changes to gonogo test randomness generation
Clean up timers for gonogo test. Make sure all timers have stopped when test cancelled
@syoung-smallwisdom
Copy link
Contributor

@faraz-hussain This branch cannot be merged into ResearchKit (or our fork). You have a bunch of stuff that is currently in pull request limbo here on this fork. Please clean this up and re-submit. Thanks!

@faraz-hussain
Copy link
Contributor Author

Cleaned up and resubmitted as #935

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants