Merge pull request ResearchKit#126 from dephillipsmichael/feature/FPHS-583

Erin-Mounts · Erin-Mounts · commit e42bb76c05a9 · 2016-06-02T10:35:43.000-07:00
feature/FPHS-583
diff --git a/APCAppCore/APCAppCore/DataSubstrate/Model/APCUser.h b/APCAppCore/APCAppCore/DataSubstrate/Model/APCUser.h
@@ -110,6 +110,9 @@ typedef NS_ENUM(NSInteger, APCUserConsentSharingScope) {
 @property (nonatomic) HKBiologicalSex biologicalSex;
 @property (nonatomic) HKBloodType bloodType;
 
+// @return YES if birthdate property comes from healthkit, NO if comes from core data
+- (BOOL) hasBirthDateInHealthKit;
+- (BOOL) hasBiologicalSexInHealthKit;
 
 @property (nonatomic, strong, nullable) HKQuantity * height;
 @property (nonatomic, strong, nullable) HKQuantity * weight;
diff --git a/APCAppCore/APCAppCore/DataSubstrate/Model/APCUser.m b/APCAppCore/APCAppCore/DataSubstrate/Model/APCUser.m
@@ -528,6 +528,14 @@ - (void)setBirthDate:(NSDate *)birthDate
     [self updateStoredProperty:kBirthDatePropertyName withValue:birthDate];
 }
 
+- (BOOL) hasBirthDateInHealthKit
+{
+    NSError *error;
+    NSDate *dateOfBirth = [self.healthStore dateOfBirthWithError:&error];
+    APCLogError2 (error);
+    return dateOfBirth != nil;
+}
+
 - (HKBiologicalSex)biologicalSex
 {
     NSError *error;
@@ -542,6 +550,14 @@ - (void)setBiologicalSex:(HKBiologicalSex)biologicalSex
     [self updateStoredProperty:kBiologicalSexPropertyName withValue:@(biologicalSex)];
 }
 
+- (BOOL) hasBiologicalSexInHealthKit
+{
+    NSError *error;
+    HKBiologicalSexObject * sexObject = [self.healthStore biologicalSexWithError:&error];
+    APCLogError2 (error);
+    return sexObject.biologicalSex != HKBiologicalSexNotSet;
+}
+
 - (HKBloodType)bloodType
 {
     NSError *error;
diff --git a/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.h b/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.h
@@ -37,7 +37,7 @@
 
 @protocol APCProfileViewControllerDelegate;
 
-@interface APCProfileViewController : APCUserInfoViewController <APCPickerTableViewCellDelegate, APCTextFieldTableViewCellDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate,UITextFieldDelegate, APCSwitchTableViewCellDelegate>
+@interface APCProfileViewController : APCUserInfoViewController <APCPickerTableViewCellDelegate, APCTextFieldTableViewCellDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate,UITextFieldDelegate, APCSwitchTableViewCellDelegate, APCSegmentedTableViewCellDelegate>
 
 @property (nonatomic, strong) APCUser *user;
 
@@ -73,6 +73,18 @@
 
 @property (nonatomic, strong) UIImage *profileImage;
 
+/*
+ * If set to YES, birthdate will be a Date Picker Cell, and can be edited when isEditing is also set to YES
+ * If set to NO, birthdate will be a Default Cell, with its value locked no matter what
+ */
+@property (nonatomic) BOOL canEditBirthDate;
+
+/*
+ * If set to YES, biological sex will be a Segment Cell, and can be edited when isEditing is also set to YES
+ * If set to NO, biological sex will be a Default Cell, with its value locked no matter what
+ */
+@property (nonatomic) BOOL canEditBiologicalSex;
+
 
 - (IBAction)leaveStudy:(id)sender;
 
@@ -111,4 +123,13 @@
 - (void)hasStartedEditing;
 
 - (void)hasFinishedEditing;
+
+/*
+ * If canEditBirthDate or canEditBiologicalSex are set to YES,
+ * This will be called if the user tries to edit either of them when we are
+ * loading them from HealthKit, but writing to HealthKit is not valid
+ * Dev should launch a dialog when this is called saying to change in the Health App
+ */
+- (void) editingFailedForHealthKitType:(NSString*) healthKitIdentifier;
+
 @end
diff --git a/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.m b/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.m
@@ -82,6 +82,10 @@
 static NSString * const kAPCBasicTableViewCellIdentifier = @"APCBasicTableViewCell";
 static NSString * const kAPCRightDetailTableViewCellIdentifier = @"APCRightDetailTableViewCell";
 
+@interface APCUserInfoViewController()
+- (void) setEditing:(BOOL) isEditing;
+@end
+
 @interface APCProfileViewController () <ORKTaskViewControllerDelegate>
 
 @property (weak, nonatomic) IBOutlet UILabel *versionLabel;
@@ -409,7 +413,7 @@ - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(
                     APCSegmentedTableViewCell *segmentedCell = (APCSegmentedTableViewCell *)cell;
                     segmentedCell.delegate = self;
                     segmentedCell.selectedSegmentIndex = segmentPickerField.selectedIndex;
-                    segmentedCell.userInteractionEnabled = segmentPickerField.editable;
+                    segmentedCell.userInteractionEnabled = segmentPickerField.editable && self.isEditing;
                     
                 }
                 else if ([field isKindOfClass:[APCTableViewSwitchItem class]]) {
@@ -436,6 +440,14 @@ - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(
     return cell;
 }
 
+- (void) setEditing:(BOOL) isEditing
+{
+    [super setEditing:isEditing];
+    
+    // Reload the table so that all the field items and cells are in the correct state for new "isEditing" property
+    [self.tableView reloadData];
+}
+
 #pragma mark - Prepare Content
 
 - (NSArray *)prepareContent
@@ -452,15 +464,38 @@ - (NSArray *)prepareContent
             APCUserInfoItemType itemType = type.integerValue;
             
             switch (itemType) {
+                    
                 case kAPCUserInfoItemTypeBiologicalSex:
                 {
-                    APCTableViewItem *field = [APCTableViewItem new];
-                    field.caption = NSLocalizedStringWithDefaultValue(@"Sex", @"APCAppCore", APCBundle(), @"Sex", @"");
-                    field.reuseIdentifier = kAPCDefaultTableViewCellIdentifier;
-                    field.editable = NO;
-                    field.textAlignnment = NSTextAlignmentRight;
-                    field.detailText = [APCUser stringValueFromSexType:self.user.biologicalSex];
-                    field.selectionStyle = self.isEditing ? UITableViewCellSelectionStyleGray : UITableViewCellSelectionStyleNone;
+                    APCTableViewItem *field = nil;
+                    
+                    // If we can edit biological sex, change the UI to be a segment control
+                    if (self.canEditBiologicalSex)
+                    {
+                        APCTableViewSegmentItem *segmentField = [APCTableViewSegmentItem new];
+                        segmentField.style = UITableViewCellStyleValue1;
+                        segmentField.segments = [APCUser sexTypesInStringValue];
+                        segmentField.reuseIdentifier = kAPCSegmentedTableViewCellIdentifier;
+                        
+                        if (self.user.biologicalSex) {
+                            segmentField.selectedIndex = [APCUser stringIndexFromSexType:self.user.biologicalSex];
+                            segmentField.editable = self.canEditBiologicalSex;
+                        } else {
+                            segmentField.editable = YES; // make it always editable, since user hasnt provided a valid value yet
+                        }
+                        segmentField.selectionStyle = self.isEditing && field.editable ? UITableViewCellSelectionStyleGray : UITableViewCellSelectionStyleNone;
+                        field = segmentField;
+                    }
+                    else  // if we cant edit sex, show a simple default table view cell
+                    {
+                        field = [APCTableViewItem new];
+                        field.caption = NSLocalizedStringWithDefaultValue(@"Sex", @"APCAppCore", APCBundle(), @"Sex", @"");
+                        field.reuseIdentifier = kAPCDefaultTableViewCellIdentifier;
+                        field.editable = NO;
+                        field.textAlignnment = NSTextAlignmentRight;
+                        field.detailText = [APCUser stringValueFromSexType:self.user.biologicalSex];
+                        field.selectionStyle = UITableViewCellSelectionStyleNone;
+                    }
                     
                     APCTableViewRow *row = [APCTableViewRow new];
                     row.item = field;
@@ -471,13 +506,45 @@ - (NSArray *)prepareContent
                 
                 case kAPCUserInfoItemTypeDateOfBirth:
                 {
-                    APCTableViewItem *field = [APCTableViewItem new];
+                    APCTableViewItem *field = nil;
+
+                    if (self.canEditBirthDate) // If we can edit birthdate, change the UI to be a date picker
+                    {
+                        APCTableViewDatePickerItem *dateField = [APCTableViewDatePickerItem new];
+                        dateField.datePickerMode = UIDatePickerModeDate;
+                        NSCalendar *gregorian = [[NSCalendar alloc] initWithCalendarIdentifier: NSCalendarIdentifierGregorian];
+                        NSDate *currentDate = [[NSDate date] startOfDay];
+                        NSDateComponents * comps = [[NSDateComponents alloc] init];
+                        [comps setYear: -18];
+                        NSDate *maxDate = [gregorian dateByAddingComponents: comps toDate: currentDate options: 0];
+                        dateField.maximumDate = maxDate;
+                        
+                        if (self.user.birthDate) {
+                            dateField.date = self.user.birthDate;
+                            dateField.detailText = [dateField.date toStringWithFormat:dateField.dateFormat];
+                            dateField.editable = self.canEditBirthDate;
+                        } else {
+                            dateField.editable = YES; // make it always editable, since user hasnt provided a valid value yet
+                            dateField.date = nil;
+                            dateField.detailText = @"";
+                        }
+                        field = dateField;
+                    }
+                    else // if we cant edit birthdate, show a simple default table view cell
+                    {
+                        field = [APCTableViewItem new];
+                        field.editable = NO;
+                        field.textAlignnment = NSTextAlignmentRight;
+                        field.detailText = [self.user.birthDate toStringWithFormat:NSDateDefaultDateFormat];
+                        field.selectionStyle = self.isEditing ? UITableViewCellSelectionStyleGray : UITableViewCellSelectionStyleNone;
+                    }
+                    
                     field.caption = NSLocalizedStringWithDefaultValue(@"Birthdate", @"APCAppCore", APCBundle(), @"Birthdate", @"");
+                    
+                    field.style = UITableViewCellStyleValue1;
                     field.reuseIdentifier = kAPCDefaultTableViewCellIdentifier;
-                    field.editable = NO;
-                    field.textAlignnment = NSTextAlignmentRight;
-                    field.detailText = [self.user.birthDate toStringWithFormat:NSDateDefaultDateFormat];
-                    field.selectionStyle = self.isEditing ? UITableViewCellSelectionStyleGray : UITableViewCellSelectionStyleNone;
+                    field.textAlignnment = NSTextAlignmentRight;                                                            
+                    field.selectionStyle = self.isEditing && field.editable ? UITableViewCellSelectionStyleGray : UITableViewCellSelectionStyleNone;
                     
                     APCTableViewRow *row = [APCTableViewRow new];
                     row.item = field;
@@ -1141,7 +1208,36 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                 }
             }
                 break;
-            
+                
+            case kAPCUserInfoItemTypeDateOfBirth:
+            {
+                if (self.canEditBirthDate)
+                {
+                    APCTableViewItem *field = [self itemForIndexPath:indexPath];
+                    // Check for if we grabbed this value from HealthKit, because if we did, it can't be edited from our app
+                    if (![self isEditingAllowedForHealthKitProperty:HKCharacteristicTypeIdentifierDateOfBirth])
+                    {
+                        [self showEditingNotAllowedAlertForHealthKitProperty:HKCharacteristicTypeIdentifierDateOfBirth];
+                        [tableView deselectRowAtIndexPath:indexPath animated:YES];
+                    }
+                    // only allow to be selected if we are in edit mode
+                    else if (self.isEditing && field.isEditable)
+                    {
+                        [super tableView:tableView didSelectRowAtIndexPath:indexPath];
+                    }
+                    // if we cant edit it, simply deselect the row
+                    else
+                    {
+                        [tableView deselectRowAtIndexPath:indexPath animated:YES];
+                    }
+                }
+                else
+                {
+                    [super tableView:tableView didSelectRowAtIndexPath:indexPath];
+                }
+            }
+                break;
+
             default:{
                 [super tableView:tableView didSelectRowAtIndexPath:indexPath];
             }
@@ -1233,6 +1329,59 @@ - (void)pickerTableViewCell:(APCPickerTableViewCell *)cell pickerViewDidSelectIn
     }
 }
 
+#pragma mark APCSegmentedTableViewCellDelegate methods
+
+- (void)segmentedTableViewCell:(APCSegmentedTableViewCell *) __unused cell
+       didSelectSegmentAtIndex:(NSInteger) __unused index
+{
+    [super segmentedTableViewCell:cell didSelectSegmentAtIndex:index];
+    
+    if (self.canEditBiologicalSex &&
+        ![self isEditingAllowedForHealthKitProperty:HKCharacteristicTypeIdentifierBiologicalSex])
+    {
+        [self showEditingNotAllowedAlertForHealthKitProperty:HKCharacteristicTypeIdentifierBiologicalSex];
+        // Revert back to whatever the index was originally
+        cell.selectedSegmentIndex = [APCUser stringIndexFromSexType:self.user.biologicalSex];
+    }
+}
+
+- (void) showEditingNotAllowedAlertForHealthKitProperty:(NSString*)healthKitPropertyIdentifier
+{
+    if ([self.delegate respondsToSelector:@selector(editingFailedForHealthKitType:)])
+    {
+        [self.delegate editingFailedForHealthKitType:healthKitPropertyIdentifier];
+    }
+    else  // Since there is no delegate, show our own alert view
+    {
+        NSString* title = NSLocalizedStringWithDefaultValue(@"Edit in Health App", @"APCAppCore", APCBundle(), @"Edit in Health App", @"");
+        NSString* msg = NSLocalizedStringWithDefaultValue(@"Since we are accessing this information through Health Kit, you can only change it through your device's Health App", @"APCAppCore", APCBundle(), @"Since we are accessing this information through Health Kit, you can only change it through your device's Health App", @"");
+        UIAlertController *alertView = [UIAlertController alertControllerWithTitle:title
+                                                                           message:msg
+                                                                    preferredStyle:UIAlertControllerStyleAlert];
+        
+        UIAlertAction* okAction = [UIAlertAction actionWithTitle:NSLocalizedStringWithDefaultValue(@"Okay", @"APCAppCore", APCBundle(), @"Okay", @"") style:UIAlertActionStyleDefault
+                                                         handler:^(UIAlertAction * __unused action) {}];
+        
+        [alertView addAction:okAction];
+        [self presentViewController:alertView animated:YES completion:nil];
+    }
+}
+
+- (BOOL) isEditingAllowedForHealthKitProperty:(NSString*) healthKitPropertyIdentifier
+{
+    if (healthKitPropertyIdentifier == HKCharacteristicTypeIdentifierBiologicalSex &&
+        [self.user hasBiologicalSexInHealthKit])
+    {
+        return NO;
+    }
+    else if (healthKitPropertyIdentifier == HKCharacteristicTypeIdentifierDateOfBirth &&
+             [self.user hasBirthDateInHealthKit])
+    {
+        return NO;
+    }
+    return YES;
+}
+
 #pragma mark - UIImagePickerControllerDelegate
 
 - (void) imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info
@@ -1372,6 +1521,20 @@ - (void)loadProfileValuesInModel
                 
                 case kAPCSettingsItemTypeSharingOptions:
                     break;
+                    
+                case kAPCUserInfoItemTypeDateOfBirth:
+                    if (self.canEditBirthDate) // otherwise default item will be used
+                    {
+                        self.user.birthDate = [(APCTableViewDatePickerItem *)item date];
+                    }
+                    break;
+                    
+                case kAPCUserInfoItemTypeBiologicalSex:
+                    if (self.canEditBiologicalSex) // otherwise default item will be used
+                    {
+                        self.user.biologicalSex = [APCUser sexTypeForIndex:((APCTableViewSegmentItem *)item).selectedIndex];
+                    }
+                    break;
                 
                 default:
                     break;
