Ricardo Sánchez-Sáez
cfe04441ad
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization
...
# Conflicts:
# ResearchKit.xcodeproj/project.pbxproj
# ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.m
# ResearchKit/Charts/ORKGraphChartView.m
# ResearchKit/Charts/ORKRangedPoint.m
# ResearchKit/Common/ORKHealthAnswerFormat.m
# ResearchKit/Common/ORKNavigableOrderedTask.m
# ResearchKit/Common/ORKOrderedTask.m
# ResearchKit/Common/ORKPasscodeStepViewController.m
# ResearchKit/Common/ORKSurveyAnswerCellForText.m
# ResearchKit/Common/ORKTextButton.h
# ResearchKit/Common/ORKTextFieldView.m
# Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
2016-07-08 15:05:24 +02:00
Ricardo Sánchez-Sáez
cb4ff44859
[Charts] Rename 'pointForPlotIndex:' (and related methods) to 'dataPointForPlotIndex:'
...
Also rename 'ORKGraphChartType' to 'ORKValueCollectionType'.
2016-06-23 02:51:02 +01:00
Ricardo Sánchez-Sáez
8474d39cdf
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKBarGraphChart
...
# Conflicts:
# ResearchKit/Charts/ORKGraphChartView.m
# ResearchKit/Charts/ORKGraphChartView_Internal.h
# ResearchKit/Charts/ORKLineGraphChartView.m
# ResearchKit/Common/ORKHelpers.h
2016-06-22 03:09:42 +01:00
Malcolm Hall
c1f30947be
Fix for blank white screen when app activates back from viewing the NC or a privacy prompt
2016-06-08 20:09:11 +01:00
Ricardo Sánchez-Sáez
daac3505b4
[ORKSample] Small improvement to 40x40 app icon
2016-03-22 12:45:09 +00:00
Ricardo Sánchez-Sáez
89838d63bd
[Misc] Update to Swift 2.2 code (Xcode 7.3 only)
...
(Avoid using newly deprecated methods)
2016-03-22 12:22:33 +00:00
Ricardo Sánchez-Sáez
7efb9ecb36
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKBarGraphChart
2016-03-10 18:10:44 +00:00
Ricardo Sánchez-Sáez
ea777873af
[Charts] Make 'ORKValueRange' and 'ORKValueStack' to use 'double' instead of 'CGFloat'
2016-03-10 17:58:46 +00:00
Ricardo Sánchez-Sáez
df05877256
[Charts] Rename 'ORKFloatRange' and 'ORKFloatStack' to 'ORKValueRange' and 'ORKValueStack'
2016-03-10 17:20:13 +00:00
Yuan Zhu
d1fbc178a1
Merge pull request #591 from rsanchezsaez/rsanchezsaez-master-ORKSampleIcon
...
[ORKSample] Add app icon
2016-03-09 16:12:08 -08:00
Ricardo Sánchez-Sáez
3f89fba2cf
[Charts] Implement first steps for ORKBarGraphChartView
...
Also, makes ORKTest's 'ORKDiscreteGraphChartView' tests more comprehensive.
2016-03-01 17:14:55 +00:00
Ricardo Sánchez-Sáez
0971ef71f4
[ORKSample] Fix typos in variable names
2016-02-08 17:52:46 +00:00
Ricardo Sánchez-Sáez
2db99d6152
[Charts] Rename ORKRangedPoint to ORKFloatRange
...
Also:
- Improve documentation.
- Fix ORKFloatRange's 'hasEmptyRange' property being always 'NO'.
- Fix typo in ORKGraphChartView's 'colorForPlotIndex:' method.
2016-02-08 16:24:33 +00:00
Ricardo Sánchez-Sáez
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
Ricardo Sánchez-Sáez
46c78c08a4
[Workspace] Remove duplicated ResearchKit subproject references from ORKSample and ORKTest
...
They're not needed since ResearchKit is already in the Workspace.
2016-01-16 21:35:53 +00:00
Ricardo Sánchez-Sáez
00ff2f3402
[ORKSample] Allow onboarding to proceed on the Simulator despite the lack of HealthKit
2016-01-14 21:15:59 +00:00
Yuan Zhu
429c3c9886
Update the versioning and pod spec
2016-01-11 15:20:01 -08:00
Ricardo Sánchez-Sáez
cc45d92266
[ORKSample] Add app icon
2016-01-04 20:00:33 +00:00
Ricardo Sánchez-Sáez
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
Yuan Zhu
7059bd39a6
Add RK as ORKSample's dependency.
2015-12-16 14:52:28 -08:00
Yuan Zhu
5fc4316e22
Auto deselect selected cell on profile page.
2015-12-14 16:54:18 -08:00
Yuan Zhu
b022ae3589
Limit minimum date in answer format to current time.
2015-12-14 16:46:02 -08:00
Yuan Zhu
3f7c1d15d5
Checkin the new sample app
2015-12-11 15:46:30 -08:00
Ricardo Sánchez-Sáez
Malcolm Hall
Yuan Zhu