Skip to content

Commit 0651bf0

Browse files
authoredFeb 12, 2021
Use wheel date picker style (ResearchKit#1447)
* Use wheel date picker style
1 parent 68f9d29 commit 0651bf0

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed
 

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode11
2+
osx_image: xcode12
33
xcode_project: ResearchKit.xcodeproj
44
xcode_scheme: ResearchKit
5-
xcode_destination: platform=iOS Simulator,OS=13.0,name=iPhone 11 Pro Max
5+
xcode_destination: platform=iOS Simulator,OS=14.0,name=iPhone 11 Pro Max

‎ResearchKit/Common/ORKDateTimePicker.m

+3
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ - (UIDatePicker *)pickerView {
7474
if (_pickerView == nil) {
7575
_pickerView = [[UIDatePicker alloc] init];
7676
[_pickerView addTarget:self action:@selector(valueDidChange:) forControlEvents:UIControlEventValueChanged];
77+
if (@available(iOS 13.4, *)) {
78+
_pickerView.preferredDatePickerStyle = UIDatePickerStyleWheels;
79+
}
7780
self.answerFormat = _answerFormat;
7881
self.answer = _answer;
7982
}

‎ResearchKit/Consent/ORKConsentReviewStepViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ - (ORKFormStepViewController *)makeNameFormViewController {
207207
givenNameFormItem.optional = NO;
208208
familyNameFormItem.optional = NO;
209209

210-
ORKFormItem *sectionTitleFormItem = [[ORKFormItem alloc] initWithSectionTitle:ORKLocalizedString(@"CONSENT_NAME_SECTION_TITLE", nil)];
210+
ORKFormItem *sectionTitleFormItem = [[ORKFormItem alloc] initWithSectionTitle:ORKLocalizedString(@"CONSENT_NAME_TITLE", nil)];
211211

212212
NSArray *formItems = @[sectionTitleFormItem, givenNameFormItem, familyNameFormItem];
213213
if (ORKCurrentLocalePresentsFamilyNameFirst())

0 commit comments

Comments
 (0)
Please sign in to comment.